部分代码优化

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -151,7 +151,7 @@ public class ContractController extends BaseController {
             model.addAttribute("flag", "1");
         }
         //获取已审核的项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
@@ -168,7 +168,7 @@ public class ContractController extends BaseController {
             model.addAttribute("flag", "1");
         }
         //获取已审核的项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsCaseBaseService.java

@@ -96,7 +96,7 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
         List<RuralProjectRecords> recordsList = findList(projectRecords);
 
         //查询所有和当前登陆人有关的项目的审核
-        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+        /*WorkProjectNotify workProjectNotify = new WorkProjectNotify();
         workProjectNotify.setUser(UserUtils.getUser());
         workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
         workProjectNotify.setRemarks("待审批");
@@ -139,12 +139,12 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
         workProjectNotify.setType("103");
         //查询所有需要当前登录人进行处理的项目信息
         List<WorkProjectNotify> newRecordTwoNotifyList = workProjectNotifyService.findList(workProjectNotify);
-
+*/
 
 
         //查询负责人信息
         for (RuralProjectRecords records : recordsList) {
-            this.queryContractInfos(records);
+            //this.queryContractInfos(records);
             //获取项目负责人
             List<User> users = workProjectUserDao.getProjectprincipalList(records.getId());
             records.setProjectLeaders(users);
@@ -181,7 +181,7 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
             }
 
             //新增报告展示
-            for (WorkProjectNotify notify: notifyList) {
+            /*for (WorkProjectNotify notify: notifyList) {
                 if(notify.getNotifyId().equals(records.getPrdId())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
@@ -298,7 +298,7 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
                     }
                     break;
                 }
-            }
+            }*/
 
 
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -952,7 +952,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void queryLinkmanInfos(RuralProjectRecords projectRecords) {
 		List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 1);
 		for(WorkClientLinkman linkman :clientLinkmanList){
-			WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
+			WorkClientInfo clientInfo = workClientInfoService.getById(linkman.getClientId().getId());
 			linkman.setClientId(clientInfo);
 		}
 		projectRecords.setWorkClientLinkmanList(clientLinkmanList);

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

@@ -116,6 +116,19 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
 	}
 
     /**
+     * 根据id获取客户基本信息
+     * @param id
+     * @return
+     */
+    public WorkClientInfo getById(String id) {
+	    if(StringUtils.isBlank(id)){
+	        return new WorkClientInfo();
+        }
+        WorkClientInfo workClientInfo = super.get(id);
+		return workClientInfo;
+	}
+
+    /**
      * 获取客户列表信息
      * @param workClientInfo
      * @return

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

@@ -200,7 +200,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			List<WorkClientInfo> list2 = new ArrayList<>();
 			if(list1!=null && list1.size()>0){
 				for(WorkContractClient w :list1){
-					WorkClientInfo workClientInfo = workClientInfoService.get(w.getClientId());
+					WorkClientInfo workClientInfo = workClientInfoService.getById(w.getClientId());
 					list2.add(workClientInfo);
 				}
 			}