Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -523,6 +523,7 @@ public class ActTaskService extends BaseService {
 				try{
 					formKey = formService.getTaskFormKey(procDefId, taskDefKey);
 				}catch (Exception e) {
+					logger.error("Exception e:"+e);
 					formKey = "";
 				}
 			}

src/main/java/com/jeeplus/modules/feedback/entity/QuestionFeedback.java

@@ -14,6 +14,7 @@ public class QuestionFeedback extends DataEntity<QuestionFeedback> {
     private User handlingId; //处理人
     private String handlingOpinions; //处理意见
     private String handlingStatus; //处理状态
+    private String flag;    //判断当前登录人是否是创建人
 
     public String getTitle() {
         return title;
@@ -62,4 +63,12 @@ public class QuestionFeedback extends DataEntity<QuestionFeedback> {
     public void setHandlingStatus(String handlingStatus) {
         this.handlingStatus = handlingStatus;
     }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
 }

src/main/java/com/jeeplus/modules/feedback/service/QuestionFeedbackService.java

@@ -49,6 +49,12 @@ public class QuestionFeedbackService extends CrudService<QuestionFeedbackDao, Qu
 				User u=UserUtils.get(feedback.getHandlingId().getId());
 				feedback.setHandlingId(u);
 			}
+			User uu=UserUtils.getUser();
+			if (feedback.getCreateBy().getId()==uu.getId()){
+				feedback.setFlag("1");
+			}else{
+				feedback.setFlag("0");
+			}
 		}
 		page.setList(questionFeedbackList);
 		return page;

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -851,6 +851,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
                 workattachmentService.deleteFileFromAliyun(workattachment,workattachment==null?attachmentUrl:workattachment.getUrl());
             }
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
     }

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -569,6 +569,7 @@ public class OaNotifyController extends BaseController {
                 addMessage(redirectAttributes, str);
             }
         }catch (Exception e){
+			logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "公告流程审批失败");
         }
 
@@ -644,6 +645,7 @@ public class OaNotifyController extends BaseController {
 			oaNotifyService.deleteComment(id);
 			map.put("success",true);
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 			map.put("success",false);
 		}
@@ -662,6 +664,7 @@ public class OaNotifyController extends BaseController {
 			oaNotifyService.saveComment(oaNotifyComment);
 			map.put("success",true);
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 			map.put("success",false);
 		}

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -210,6 +210,7 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 			try {
 				startTime = format.parse(time1 + "-01-01");
 			} catch (ParseException e) {
+				logger.error("Exception e:"+e);
 				e.printStackTrace();
 			}
 			workBidProjectList.setBeginContractDate(startTime);
@@ -1172,10 +1173,12 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 			workBidProjectDao.update(workBidProject);
 
 		}catch (ActivitiObjectNotFoundException e){
+			logger.error("Exception e:"+e);
 			System.err.println("撤销投标申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		}
 		catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}finally {
 			long end = System.currentTimeMillis();

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -30,6 +30,10 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
     int countByUscCode(String uscCode);
     int queryCount(WorkClientInfo workClientInfo);
 
+    List<WorkClientInfo> findAll(WorkClientInfo workClientInfo);
+    int queryAllCount(WorkClientInfo workClientInfo);
+
+
 
     List<WorkClientInfo> findByName(WorkClientInfo workClientInfo);
 

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -232,6 +232,55 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         page.setList(list);
         return page;
     }
+    /**
+     * 获取开票单位
+     * @param page 分页对象
+     * @param workClientInfo
+     * @return
+     */
+    public Page<WorkClientInfo> findAllPage(Page<WorkClientInfo> page, WorkClientInfo workClientInfo) {
+        workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+//        workClientInfo.getSqlMap().put("dsf", dataScopeFilter(workClientInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CLIENT_INFO.getValue()));
+        long t1 = System.currentTimeMillis();
+        //根据项目类型获取对应的客户id个数
+        int count = workClientInfoDao.queryAllCount(workClientInfo);
+        page.setCount(count);
+        long t2 = System.currentTimeMillis();
+        logger.info("查询客户总数耗时：{}",t2-t1);
+        page.setCountFlag(false);
+        workClientInfo.setPage(page);
+        List<WorkClientInfo> list = workClientInfoDao.findAll(workClientInfo);
+        //根据客户id查询客户的相关客户类型
+        for (WorkClientInfo clientInfo: list) {
+            clientInfo.setJobTypeStr(workClientInfoDao.getJobTypeStr(clientInfo.getId()));
+        }
+        long t3 = System.currentTimeMillis();
+        logger.info("查询客户列表耗时：{}",t3-t2);
+        if(list!=null && list.size()>0){
+            for (int i = 0; i < list.size(); i++) {
+                WorkClientInfo entity = list.get(i);
+                List<WorkClientLinkman> linkmanList = findLinkmanList(entity);
+                entity.setWorkClientLinkmanList(linkmanList);
+                if(linkmanList!=null && linkmanList.size()>0){
+                    StringBuilder builder = new StringBuilder();
+                    for (int j = 0; j < linkmanList.size(); j++) {
+                        builder.append(linkmanList.get(j).getName());
+                        if(j<linkmanList.size()-1){
+                            builder.append(",");
+                        }
+                    }
+                    entity.setLinkManNames(builder.toString());
+                }
+                List<WorkClientBank> bankList = findBankList(entity);
+                entity.setWorkClientBankList(bankList);
+            }
+        }
+        long t4 = System.currentTimeMillis();
+        logger.info("查询客户详情耗时：{}",t4-t3);
+        logger.info("查询客户总耗时：{}",t4-t1);
+        page.setList(list);
+        return page;
+    }
 
 
 

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -1932,8 +1932,10 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 							workClientAttachment1.setAttachmentId(uuid);
 							workClientAttachmentDao.insert(workClientAttachment1);
 						} catch (IllegalAccessException e) {
+							logger.error("Exception e:"+e);
 							e.printStackTrace();
 						} catch (InvocationTargetException e) {
+							logger.error("Exception e:"+e);
 							e.printStackTrace();
 						}
 					}
@@ -1974,12 +1976,14 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workClientAttachment.setType(suffix);
 			workClientAttachment.setAttachmentFlag(attachmentFlag);
 		} catch (IOException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		} finally {
 			try {
 				if (inputStream != null)
 					inputStream.close();
 			} catch (IOException e) {
+				logger.error("Exception e:"+e);
 				e.printStackTrace();
 			}
 		}
@@ -2595,10 +2599,12 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workContractInfoDao.updateInvalidateStatusAndUser(workContractInfo);
 
 		}catch (ActivitiObjectNotFoundException e){
+			logger.error("Exception e:"+e);
 			System.err.println("撤销合同作废异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		}
 		catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 
@@ -2621,6 +2627,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workContractInfoDao.update(workContractInfo);
 
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 
@@ -2868,10 +2875,12 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workContractInfoDao.update(workContractInfo);
 
 		}catch (ActivitiObjectNotFoundException e){
+			logger.error("Exception e:"+e);
 			System.err.println("撤销异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		}
 		catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 
@@ -3195,6 +3204,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			try {
 				startTime = format.parse(time1 + "-01-01");
 			} catch (ParseException e) {
+				logger.error("Exception e:"+e);
 				e.printStackTrace();
 			}
 			workContractListInfo.setBeginContractDate(startTime);

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -716,10 +716,12 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 			workContractRecordDao.update(workContractRecord);
 
 		}catch (ActivitiObjectNotFoundException e){
+			logger.error("Exception e:"+e);
 			System.err.println("撤销合同作废异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		}
 		catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 	}
@@ -733,6 +735,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 				a  = a+1;
 				return num+"-"+String.valueOf(a);
 			} catch (NumberFormatException e) {
+				logger.error("Exception e:"+e);
 				e.printStackTrace();
 			}
 		}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -682,7 +682,7 @@ public class WorkInvoiceAllController extends BaseController {
 	 */
 	@RequestMapping(value = "selectclient")
 	public String selectclient(WorkClientInfo client, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<WorkClientInfo> page = workClientInfoService.findPage(new Page<WorkClientInfo>(request, response), client);
+		Page<WorkClientInfo> page = workClientInfoService.findAllPage(new Page<WorkClientInfo>(request, response), client);
 		try {
 			fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -703,7 +703,7 @@ public class WorkInvoiceController extends BaseController {
 	 */
 	@RequestMapping(value = "selectclient")
 	public String selectclient(WorkClientInfo client, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<WorkClientInfo> page = workClientInfoService.findPage(new Page<WorkClientInfo>(request, response), client);
+		Page<WorkClientInfo> page = workClientInfoService.findAllPage(new Page<WorkClientInfo>(request, response), client);
 		try {
 			fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");

src/main/java/com/jeeplus/modules/workinvoicealter/service/WorkInvoiceAlterService.java

@@ -795,9 +795,11 @@ public class WorkInvoiceAlterService extends CrudService<WorkInvoiceAlterDao, Wo
 			workInvoice.preUpdate();
 			workInvoiceAlterDao.update(workInvoice);
 		} catch (ActivitiObjectNotFoundException e) {
+			logger.error("Exception e:"+e);
 			System.err.println("撤销发票变更申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 	}

src/main/java/com/jeeplus/modules/workinvoicedetail/service/WorkInvoiceDetailService.java

@@ -744,10 +744,12 @@ public class WorkInvoiceDetailService extends CrudService<WorkInvoiceDetailDao,
 			workInvoiceDetailDao.update(workInvoiceDetail);
 
 		}catch (ActivitiObjectNotFoundException e){
+			logger.error("Exception e:"+e);
 			System.err.println("撤销异常，因为这个流程已不存在!");
 			e.printStackTrace();
 		}
 		catch (Exception e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -76,6 +76,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 			user.setBranchOffice(branchOffice);
 			return super.findList(workProjectNotify);
 		}catch (Exception e){
+			logger.error("Exception e:"+e);
 			return super.findList(workProjectNotify);
 		}
 
@@ -162,6 +163,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 			dao.updateReadStateByNotifyId(workProjectNotify);
 			return users;
 		}catch (Exception e){
+			logger.error("Exception e:"+e);
 			return null;
 		}
 	}

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -152,6 +152,149 @@
 		</choose>
 	</select>
 
+	<select id="findAll" resultType="WorkClientInfo" >
+		SELECT
+		<include refid="workClientInfoColumns"/>
+		,su.name as "userName"
+		FROM work_client_info a
+		<include refid="workClientInfoJoinsLink"/>
+		left join sys_user su on su.id = a.create_by
+		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
+			LEFT JOIN work_client_linkman b ON a.id = b.client_id
+		</if>
+		left join work_client_job_type_info c on c.work_client_id=a.id
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<!--<if test="workClientLinkman != null and workClientLinkman.id != '' and workClientLinkman.id != null">-->
+			<!--LEFT JOIN work_client_linkman b ON a.id = b.client_id-->
+			<!--and b.id = #{workClientLinkman.id}-->
+			<!--</if>-->
+			<if test="name != null and name != ''">
+				AND a.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+			<if test="companyType != null and companyType != ''">
+				AND a.company_type = #{companyType}
+			</if>
+			<if test="companyIndustry != null and companyIndustry != ''">
+				AND a.company_industry = #{companyIndustry}
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND (a.area_id = #{area.id} OR find_in_set(#{area.id},a.area_parent_ids))
+			</if>
+			<if test="workClientLinkman != null and workClientLinkman.name != null and workClientLinkman.name !=''">
+				AND b.name LIKE concat('%',#{workClientLinkman.name},'%')
+			</if>
+			<if test="workClientLinkman != null and workClientLinkman.linkPhone != null and workClientLinkman.linkPhone !=''">
+				AND b.link_phone LIKE concat('%',#{workClientLinkman.linkPhone},'%')
+			</if>
+			<if test="address != null and address != ''">
+				AND a.address LIKE
+				<if test="dbName == 'oracle'">'%'||#{address}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{address}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{address},'%')</if>
+			</if>
+			<if test="clientType != null and clientType != ''">
+				AND a.client_type like concat('%',#{clientType},'%')
+			</if>
+			<if test="uscCode != null and uscCode != ''">
+				AND a.usc_code like concat('%',#{uscCode},'%')
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name like concat('%',#{createNameStr},'%'))
+			</if>
+			AND a.company_id = #{currentUser.company.id}
+			<choose>
+				<when test="jobTypeShow !=null and jobTypeShow !=''">
+					AND c.job_type_id = #{jobTypeShow}
+				</when>
+				<otherwise>
+
+				</otherwise>
+			</choose>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	<select id="queryAllCount" resultType="int" >
+		SELECT
+		count(distinct a.id)
+		FROM work_client_info a
+		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
+			LEFT JOIN work_client_linkman b ON a.id = b.client_id
+		</if>
+		left join work_client_job_type_info c on c.work_client_id=a.id
+		left join sys_user su on su.id = a.create_by
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="name != null and name != ''">
+				AND a.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+			<if test="companyType != null and companyType != ''">
+				AND a.company_type = #{companyType}
+			</if>
+			<if test="companyIndustry != null and companyIndustry != ''">
+				AND a.company_industry = #{companyIndustry}
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND (a.area_id = #{area.id} OR find_in_set(#{area.id},a.area_parent_ids))
+			</if>
+			<if test="workClientLinkman != null and workClientLinkman.name != null and workClientLinkman.name !=''">
+				AND b.name LIKE concat('%',#{workClientLinkman.name},'%')
+			</if>
+			<if test="workClientLinkman != null and workClientLinkman.linkPhone != null and workClientLinkman.linkPhone !=''">
+				AND b.link_phone LIKE concat('%',#{workClientLinkman.linkPhone},'%')
+			</if>
+			<if test="address != null and address != ''">
+				AND a.address LIKE
+				<if test="dbName == 'oracle'">'%'||#{address}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{address}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{address},'%')</if>
+			</if>
+			<if test="clientType != null and clientType != ''">
+				AND a.client_type like concat('%',#{clientType},'%')
+			</if>
+			<if test="uscCode != null and uscCode != ''">
+				AND a.usc_code like concat('%',#{uscCode},'%')
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name = #{createNameStr})
+			</if>
+			AND a.company_id = #{currentUser.company.id}
+			<choose>
+				<when test="jobTypeShow !=null and jobTypeShow !=''">
+					AND c.job_type_id = #{jobTypeShow}
+				</when>
+				<otherwise>
+
+				</otherwise>
+			</choose>
+		</where>
+	</select>
+
     <select id="queryCount" resultType="int" >
         SELECT
         count(distinct a.id)

src/main/webapp/webpage/modules/feedback/feedbackList.jsp

@@ -514,12 +514,15 @@
                     ,"handlingName":"${feedback.handlingId.name}"
                     ,"handlingStatus":"${feedback.handlingStatus}"
                     ,"tmdcreateDate":"<fmt:formatDate value="${feedback.createDate}" pattern="yyyy-MM-dd"/>"
-					<shiro:hasPermission name="feedback:questionFeedback:edit">
-					,"canedit1":1
-					</shiro:hasPermission>
-					<shiro:hasPermission name="feedback:questionFeedback:del">
-					,"canedit2":2
-					</shiro:hasPermission>
+					<c:choose>
+						<c:when test="${feedback.flag=='1'}">
+							,"canedit1":1
+							,"canedit2":2
+						</c:when>
+						<c:otherwise>
+
+						</c:otherwise>
+					</c:choose>
 					<shiro:hasPermission name="feedback:questionFeedback:handle">
 					<c:choose>
 						<c:when test="${feedback.handlingStatus!='1'}">

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -317,7 +317,7 @@
 
                     <div style="clear: both;"></div>
                 </div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
                 <!-- 分页代码 -->
                 <table:page page="${page}"></table:page>
                 <div style="clear: both;"></div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -250,7 +250,8 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
 				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
@@ -287,6 +288,7 @@
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
+					,"conId":"${projectRecords.workContractInfo.id}"
 					,"client":"${projectRecords.workContractInfo.client.name}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -236,7 +236,7 @@
 			,page: false
 			,cols: [[
 				// {checkbox: true, fixed: true},
-				{field:'index',align:'center', title: '序号',width:40}
+				{field:'index',align:'center', title: '序号',width:50}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
@@ -250,7 +250,8 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
 				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
@@ -287,6 +288,7 @@
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
+					,"conId":"${projectRecords.workContractInfo.id}"
 					,"client":"${projectRecords.workContractInfo.client.name}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -329,7 +329,8 @@
 					}}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -394,6 +395,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -421,7 +421,9 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -496,6 +498,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -522,7 +522,7 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -599,6 +599,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"conId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -487,7 +487,8 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                 		if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -568,6 +569,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"conId":"${projectRecords.workContractInfo.id}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp

@@ -98,8 +98,12 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
+							</div>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -167,8 +171,11 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<table:exportExcel url="${ctx}/ruralCostProjectReport/ruralCostProjectReport/export"></table:exportExcel><!-- 导出按钮 -->
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
+					<div class="layui-btn-group">
+						<table:exportExcel url="${ctx}/ruralCostProjectReport/ruralCostProjectReport/export"></table:exportExcel><!-- 导出按钮 -->
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+
 
 					<div style="clear: both;"></div>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp

@@ -156,8 +156,8 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'year',align:'center', sort:true,title: '年份'}
-                ,{field:'month',align:'center', sort:true,title: '月份'}
+                ,{field:'year',align:'center', sort:true,title: '年份',width:100}
+                ,{field:'month',align:'center', sort:true,title: '月份',width:60}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -552,7 +552,7 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
@@ -563,7 +563,7 @@
 
                     <div style="clear: both;"></div>
 				</div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -661,7 +661,8 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName && null!= d.contractName) {
-									return  d.contractName;
+									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+									// return  d.contractName;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 								}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -555,7 +555,7 @@
 
                     <div style="clear: both;"></div>
 				</div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -655,6 +655,8 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName && null!= d.contractName){
+									return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+
 									return  d.contractName ;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -619,7 +619,7 @@
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">添加</button>
 						</shiro:hasPermission>
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
 							<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
@@ -630,7 +630,7 @@
 							<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 
-						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">--%>
 <%--						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>