Merge remote-tracking branch 'origin/master'

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

@@ -666,7 +666,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
                 if (type == 2) {
                     //判定如果是B类紧急项目 则不进行流程，直接通过
-                    if("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject())){
+                    if("1".equals(ruralProjectRecords.getSubmitMoney())){
 //                        saveReviewAudit(projectReportData,projectRecord,infoId);
                         //判断，如果项目类别为审定（内）则走审定内的质量复核流程
                         if(null != ruralProjectRecords.getAttachmentProjectSort() && "8".equals(ruralProjectRecords.getAttachmentProjectSort())){

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

@@ -530,6 +530,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 				break;
 		}
+		if(projectRecords.getProjectLeaders().size()>0){
+			projectRecords.setProjectMasterId(projectRecords.getProjectLeaders().get(0).getId());
+		}
         if(projectRecords.getProjectStatus()== ProjectStatusEnum.INVALID.getValue()){
             projectRecords.setId(IdGen.uuid());
             dao.insert(projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -539,6 +539,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
         //使用迭代器去除重复信息
         //排除 重新申请|撤销
+        RuralReportConsultant consultantBzshb = new RuralReportConsultant();
         Iterator<RuralReportConsultant> it = consultantList.iterator();
         while(it.hasNext()){
             RuralReportConsultant consultant = it.next();
@@ -551,12 +552,15 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 it.remove();
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                 if("8".equals(ruralProjectRecords.getAttachmentProjectSort()) || "1".equals(ruralProjectRecords.getSubmitMoney())){
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
                     //根据用户查询技能信息
                     List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     for (WorkStaffCertificate certificateInfo: certificateList) {
-                        if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
-                            consultant.setZhucezigezhID(certificateInfo.getNum());
-                        }
                         for (MainDictDetail type : certificateMajor) {
                             if(certificateInfo.getMajor().equals(type.getValue())){
                                 consultant.setMajor(type.getLabel());
@@ -566,6 +570,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     User user=userService.get(consultant.getZixunyuan());
                     consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
                     consultant.setZixunyuanId(user.getId());
+                    consultant.setRole("技术负责人");
+                    consultantBzshb = consultant;
+                    it.remove();
                 }else{
                     it.remove();
                 }
@@ -586,6 +593,45 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 consultant.setZixunyuanName(user.getName());
             }
         }
+
+        if(StringUtils.isNotBlank(consultantBzshb.getId())){
+            consultants.add(consultantBzshb);
+        }
+
+        if("1".equals(records.getSubmitMoney())){
+            Integer jsfzrCount = 0;
+            for (RuralReportConsultant consultant: consultants) {
+                if("技术负责人".equals(consultant.getRole())){
+                    jsfzrCount ++;
+                }
+            }
+            if(jsfzrCount == 0 && StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
+                RuralReportConsultant consultant = new RuralReportConsultant();
+                consultant.setZixunyuan(projectReportData.getBzshbUserId());
+
+                WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(projectReportData.getBzshbUserId());
+                workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+
+                User chenHongXing=UserUtils.getByLoginName("陈红星");
+                if(null != chenHongXing){
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+                    consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    for (MainDictDetail type : certificateMajor) {
+                        if(chenHongXingStaffCertificate.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                    User user=userService.get(consultant.getZixunyuan());
+                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanId(user.getId());
+                    consultant.setRole("技术负责人");
+                    consultants.add(consultant);
+                }
+            }
+        }
+
         consultants.addAll(consultantList);
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
         //添加项目类型

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -303,8 +303,8 @@ public class RuralCostProjectRecordsController extends BaseController {
         } else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
-            projectRecords.setLeaderIds(UserUtils.getUser().getId());
-            projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+            //projectRecords.setLeaderIds(UserUtils.getUser().getId());
+            //projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
             projectRecords.setCreateReportFlag(true);
             model.addAttribute("projectStartDate", "");
             model.addAttribute("projectEndDate", "");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -513,6 +513,7 @@ public class RuralProjectMessageNewController extends BaseController {
         List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
         //使用迭代器去除重复信息
         //排除 重新申请|撤销
+        RuralReportConsultant consultantBzshb = new RuralReportConsultant();
         Iterator<RuralReportConsultant> it = consultantList.iterator();
         while(it.hasNext()){
             RuralReportConsultant consultant = it.next();
@@ -525,12 +526,15 @@ public class RuralProjectMessageNewController extends BaseController {
                 it.remove();
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                 if("1".equals(ruralProjectRecords.getSubmitMoney())){
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
                     //根据用户查询技能信息
                     List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     for (WorkStaffCertificate certificateInfo: certificateList) {
-                        if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
-                            consultant.setZhucezigezhID(certificateInfo.getNum());
-                        }
                         for (MainDictDetail type : certificateMajor) {
                             if(certificateInfo.getMajor().equals(type.getValue())){
                                 consultant.setMajor(type.getLabel());
@@ -540,6 +544,9 @@ public class RuralProjectMessageNewController extends BaseController {
                     User user=userService.get(consultant.getZixunyuan());
                     consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
                     consultant.setZixunyuanId(user.getId());
+                    consultant.setRole("技术负责人");
+                    consultantBzshb = consultant;
+                    it.remove();
                 }else{
                     it.remove();
                 }
@@ -560,6 +567,45 @@ public class RuralProjectMessageNewController extends BaseController {
                 consultant.setZixunyuanName(user.getName());
             }
         }
+
+        if(StringUtils.isNotBlank(consultantBzshb.getId())){
+            consultants.add(consultantBzshb);
+        }
+
+        if("1".equals(ruralProjectRecords.getSubmitMoney())){
+            Integer jsfzrCount = 0;
+            for (RuralReportConsultant consultant: consultants) {
+                if("技术负责人".equals(consultant.getRole())){
+                    jsfzrCount ++;
+                }
+            }
+            if(jsfzrCount == 0 && StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
+                RuralReportConsultant consultant = new RuralReportConsultant();
+                consultant.setZixunyuan(projectReportData.getBzshbUserId());
+
+                WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(projectReportData.getBzshbUserId());
+                workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+
+                User chenHongXing=UserUtils.getByLoginName("陈红星");
+                if(null != chenHongXing){
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+                    consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    for (MainDictDetail type : certificateMajor) {
+                        if(chenHongXingStaffCertificate.getMajor().equals(type.getValue())){
+                            consultant.setMajor(type.getLabel());
+                        }
+                    }
+                    User user=userService.get(consultant.getZixunyuan());
+                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanId(user.getId());
+                    consultant.setRole("技术负责人");
+                    consultants.add(consultant);
+                }
+            }
+        }
+
         consultants.addAll(consultantList);
         ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
         //添加项目类型

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -275,8 +275,8 @@ public class RuralProjectRecordsController extends BaseController {
         } else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());
-            projectRecords.setLeaderIds(UserUtils.getUser().getId());
-            projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+            //projectRecords.setLeaderIds(UserUtils.getUser().getId());
+            //projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
             projectRecords.setCreateReportFlag(true);
             model.addAttribute("projectStartDate", "");
             model.addAttribute("projectEndDate", "");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3737,7 +3737,6 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 					}
-					//根据项目id查找咨询员信息
 					List<RuralReportConsultant> consultants = Lists.newArrayList();
 					//将自己添加到咨询员数据中
 					//根据用户查询技能信息
@@ -3751,9 +3750,9 @@ public class WorkProjectNotifyController extends BaseController {
 					for (WorkStaffCertificate certificateInfo: userCertificateList) {
 						currentConsultant.setZhucezigezhID(certificateInfo.getNum());
 						currentConsultant.setZhucezigezhKey(certificateInfo.getName());
-						for (MainDictDetail type : certificateMajor) {
-							if(certificateInfo.getMajor().equals(type.getValue())){
-								currentConsultant.setMajor(type.getLabel());
+						for (MainDictDetail detailType : certificateMajor) {
+							if(certificateInfo.getMajor().equals(detailType.getValue())){
+								currentConsultant.setMajor(detailType.getLabel());
 							}
 						}
 						User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
@@ -3762,8 +3761,12 @@ public class WorkProjectNotifyController extends BaseController {
 						currentConsultant.setRole("负责人");
 						consultants.add(currentConsultant);
 					}
+					//获取总审人员
+					User user=new User();
+					//查询总审人员信息
+					RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
 					//根据项目id查找报告咨询员信息
-					List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectReportData.getProject().getId());
+					List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(ruralProjectRecords.getId());
 					//使用迭代器去除重复信息
 					//排除 重新申请|撤销
 					Iterator<RuralReportConsultant> it = consultantList.iterator();
@@ -3783,17 +3786,121 @@ public class WorkProjectNotifyController extends BaseController {
 								if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
 									consultant.setZhucezigezhID(certificateInfo.getNum());
 								}
-								for (MainDictDetail type : certificateMajor) {
-									if(certificateInfo.getMajor().equals(type.getValue())){
-										consultant.setMajor(type.getLabel());
+								for (MainDictDetail detailType : certificateMajor) {
+									if(certificateInfo.getMajor().equals(detailType.getValue())){
+										consultant.setMajor(detailType.getLabel());
 									}
 								}
 							}
-							User user=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName(user.getName());
+							user=userService.get(consultant.getZixunyuan());
 							consultant.setRole("咨询员");
+							consultant.setZixunyuanName(user.getName());
+							if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+								User chenHongXing=UserUtils.getByLoginName("陈红星");
+								List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+								//获取陈红星的造价师信息
+								WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+								//根据用户查询技能信息
+								List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+								for (WorkStaffCertificate certificateInfo: certificateBList) {
+									for (MainDictDetail type1 : certificateMajor) {
+										if(certificateInfo.getMajor().equals(type1.getValue())){
+											bzshbConsultant.setMajor(type1.getLabel());
+										}
+									}
+								}
+
+								bzshbConsultant = consultant;
+								bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+								bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+								bzshbConsultant.setRole("技术负责人");
+								it.remove();
+							}
 						}
 					}
+
+					if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+						consultants.add(bzshbConsultant);
+					}else{
+						//查询总审人员信息
+						bzshbConsultant = new RuralReportConsultant();
+						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
+						if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+							bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
+						}
+						for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
+							bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
+							bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
+							for (MainDictDetail dictType : certificateMajor) {
+								if(certificateInfo.getMajor().equals(dictType.getValue())){
+									bzshbConsultant.setMajor(dictType.getLabel());
+								}
+							}
+							User bzshbUser=userService.get(projectReportData.getBzshbUserId());
+							bzshbConsultant.setZixunyuanName(bzshbUser.getName());
+							bzshbConsultant.setZixunyuan(bzshbUser.getId());
+							consultants.add(bzshbConsultant);
+						}
+						Iterator<RuralReportConsultant> itView = consultants.iterator();
+						while(itView.hasNext()){
+							RuralReportConsultant consultant = itView.next();
+							if(bzshbCertificateList.size()>0){
+								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
+									try {
+										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setRole("技术负责人");
+									} catch (Exception e) {
+										e.printStackTrace();
+									}
+									itView.remove();
+								}
+							}else{
+								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+									try {
+										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
+										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setRole("技术负责人");
+									} catch (Exception e) {
+										e.printStackTrace();
+									}
+									itView.remove();
+								}
+							}
+						}
+						if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+							consultants.add(bzshbConsultant);
+						}else{
+							if(StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
+								user=userService.get(projectReportData.getBzshbUserId());
+
+								User chenHongXing=UserUtils.getByLoginName("陈红星");
+								List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+								//获取陈红星的造价师信息
+								WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+								//根据用户查询技能信息
+								List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+								for (WorkStaffCertificate certificateInfo: certificateBList) {
+									for (MainDictDetail type1 : certificateMajor) {
+										if(certificateInfo.getMajor().equals(type1.getValue())){
+											bzshbConsultant.setMajor(type1.getLabel());
+										}
+									}
+								}
+
+
+								bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+
+								bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+								bzshbConsultant.setZixunyuan(user.getId());
+								bzshbConsultant.setRole("技术负责人");
+								consultants.add(bzshbConsultant);
+							}
+						}
+					}
+
 					consultants.addAll(consultantList);
 
 					//根据条件查询附件必填项
@@ -3929,6 +4036,7 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("consultantCount", consultants.size());
 					model.addAttribute("subProjectInfos", subProjectInfos);
 					model.addAttribute("workContractInfo", workContractInfo);
+					model.addAttribute("projectGrade", ruralProjectRecords.getSubmitMoney());
 					//tap页
 					//查询所有的工程类型
 					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
@@ -3956,6 +4064,9 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportData.setProjectReviewList(workReviewAudits);
 					}
 					model.addAttribute("projectReportData", projectReportData);
+
+
+
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
@@ -3973,62 +4084,7 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 						model.addAttribute("lists", workReviewAudits);
-						//查询总审人员信息
-						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
-						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
-						if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
-							bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
-						}
-						for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
-							bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
-							bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
-							for (MainDictDetail dictType : certificateMajor) {
-								if(certificateInfo.getMajor().equals(dictType.getValue())){
-									bzshbConsultant.setMajor(dictType.getLabel());
-								}
-							}
-							User bzshbUser=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName(bzshbUser.getName());
-							bzshbConsultant.setZixunyuan(bzshbUser.getId());
-						}
 
-						Iterator<RuralReportConsultant> itView = consultants.iterator();
-						while(itView.hasNext()){
-							RuralReportConsultant consultant = itView.next();
-							if(bzshbCertificateList.size()>0){
-								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}else{
-								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}
-						}
-
-						if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
-							consultants.add(bzshbConsultant);
-						}else{
-							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
-							bzshbConsultant.setZixunyuan(user.getId());
-							bzshbConsultant.setRole("技术负责人");
-							consultants.add(bzshbConsultant);
-						}
 						model.addAttribute("consultantinfo", consultants);
 						model.addAttribute("consultantCount", consultants.size());
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
@@ -4036,62 +4092,7 @@ public class WorkProjectNotifyController extends BaseController {
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						//查询总审人员信息
-						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
-						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
-						if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
-							bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
-						}
-						for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
-							bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
-							bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
-							for (MainDictDetail dictType : certificateMajor) {
-								if(certificateInfo.getMajor().equals(dictType.getValue())){
-									bzshbConsultant.setMajor(dictType.getLabel());
-								}
-							}
-							User bzshbUser=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName(bzshbUser.getName());
-							bzshbConsultant.setZixunyuan(bzshbUser.getId());
-							consultants.add(bzshbConsultant);
-						}
-						Iterator<RuralReportConsultant> itView = consultants.iterator();
-						while(itView.hasNext()){
-							RuralReportConsultant consultant = itView.next();
-							if(bzshbCertificateList.size()>0){
-								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}else{
-								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}
-						}
 
-						if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
-							consultants.add(bzshbConsultant);
-						}else{
-							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
-							bzshbConsultant.setZixunyuan(user.getId());
-							bzshbConsultant.setRole("技术负责人");
-							consultants.add(bzshbConsultant);
-						}
 						model.addAttribute("consultantinfo", consultants);
 						model.addAttribute("consultantCount", consultants.size());
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
@@ -4114,13 +4115,7 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("identificationName","报告审核意见");
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-						Iterator<RuralReportConsultant> itView = consultants.iterator();
-						while(itView.hasNext()){
-							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-								itView.remove();
-							}
-						}
+
 						model.addAttribute("info", consultants);
 						model.addAttribute("consultantCount", consultants.size());
 
@@ -4140,62 +4135,7 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 						model.addAttribute("lists", workReviewAudits);
-						//查询总审人员信息
-						RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
-						List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
-						if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
-							bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(projectReportData.getBzshbUserId());
-						}
-						for (WorkStaffCertificate certificateInfo: bzshbCertificateList) {
-							bzshbConsultant.setZhucezigezhID(certificateInfo.getNum());
-							bzshbConsultant.setZhucezigezhKey(certificateInfo.getName());
-							for (MainDictDetail dictType : certificateMajor) {
-								if(certificateInfo.getMajor().equals(dictType.getValue())){
-									bzshbConsultant.setMajor(dictType.getLabel());
-								}
-							}
-							User bzshbUser=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName(bzshbUser.getName());
-							bzshbConsultant.setZixunyuan(bzshbUser.getId());
-							consultants.add(bzshbConsultant);
-						}
-						Iterator<RuralReportConsultant> itView = consultants.iterator();
-						while(itView.hasNext()){
-							RuralReportConsultant consultant = itView.next();
-							if(bzshbCertificateList.size()>0){
-								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}else{
-								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-									try {
-										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
-										bzshbConsultant.setRole("技术负责人");
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-									itView.remove();
-								}
-							}
-						}
 
-						if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
-							consultants.add(bzshbConsultant);
-						}else{
-							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
-							bzshbConsultant.setZixunyuan(user.getId());
-							bzshbConsultant.setRole("技术负责人");
-							consultants.add(bzshbConsultant);
-						}
 						model.addAttribute("consultantinfo", consultants);
 						model.addAttribute("consultantCount", consultants.size());
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -1165,6 +1165,43 @@
                                     </td>
                                 </tr>//-->
 						</script>
+						<script type="text/template" id="workClientBankTplTechnology">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    	<input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                    	<input id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" type="hidden" value="{{row.zixunyuan}}"/>
+										<input id="reportedConsultantList{{idx}}_zixunyuanName" readonly="true" name="reportedConsultantList[{{idx}}].zixunyuanName" value="{{row.zixunyuanName}}" readonly="true" class="form-control"/>
+                                    </td>
+									<td>
+										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
+									</td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeader')" class="form-control judgment"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+
+                                    </td>
+                                </tr>//-->
+						</script>
 					</div>
 				</div>
 			</div>
@@ -2107,11 +2144,16 @@
 	var workClientBankRowIdx = 0,
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	workClientBankTplFirst = $("#workClientBankTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+	workClientBankTplTechnology = $("#workClientBankTplTechnology").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	$(document).ready(function () {
 		var dataBank = ${fns:toJson(info)};
+		var projectGrade = '${projectGrade}';
 		for (var i = 0; i < dataBank.length; i++) {
 			if(i == 0){
 				addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTplFirst, dataBank[i]);
+			}else if(i ==1 && projectGrade == 1){
+				addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTplTechnology, dataBank[i]);
+
 			}else{
 				addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
 			}
@@ -2120,10 +2162,35 @@
 	});
 
 	function consultant(id, workClientBankRowIdx, workClientBankTpl) {
+		var projectGrade = '${projectGrade}';
 		//根据id查询咨询员列表现有数据量
 		var length = $("#reportedConsultantList").find("tr").length;
 		if(length == 0){
 			addRow(id, workClientBankRowIdx, workClientBankTplFirst, "");
+		}else if(length ==1 && projectGrade == 1){
+			var bzshbUserId = $("#bzshbUserId").val();
+			if(undefined == bzshbUserId || null == bzshbUserId || '' == bzshbUserId){
+				parent.layer.msg("请先选择审核人员!", {icon: 5});
+				return false;
+			}else{
+				addRow(id, length, workClientBankTplTechnology, "");
+				var bzshbUserId = $("#bzshbUserId").val();
+				$.ajax({
+					type:"post",
+					url:'${ctx}/ruralProject/ruralCostProjectMessage/getWorkUserBYJudgement',
+					data:{"id":bzshbUserId},
+					dataType:"json",
+					success:function(result){
+						console.log(result)
+						$("#reportedConsultantList2_zixunyuan").val(result.zixunyuanId);
+						$("#reportedConsultantList2_zixunyuanName").val(result.zixunyuanName);
+						$("#reportedConsultantList2_zhucezigezhID").val(result.num);
+						$("#reportedConsultantList2_zhucezigezhKey").val(result.name);
+						$("#reportedConsultantList2_major").val(result.major);
+						$("#reportedConsultantList2_idCard").val(result.idCard);
+					}
+				})
+			}
 		}else{
 			addRow(id, workClientBankRowIdx, workClientBankTpl, "");
 		}

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

@@ -1042,8 +1042,9 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                               cssStyle="background-color:#fff"  title="项目负责人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                                                    cssStyle="background-color:#fff"  title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -1088,8 +1088,9 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                                       cssStyle="background-color:#fff"  title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -912,6 +912,43 @@
                                     </td>
                                 </tr>//-->
                         </script>
+                        <script type="text/template" id="workClientBankTplTechnology">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    	<input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                    	<input id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" type="hidden" value="{{row.zixunyuan}}"/>
+										<input id="reportedConsultantList{{idx}}_zixunyuanName" readonly="true" name="reportedConsultantList[{{idx}}].zixunyuanName" value="{{row.zixunyuanName}}" readonly="true" class="form-control"/>
+                                    </td>
+									<td>
+										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
+									</td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeader')" class="form-control judgment"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+
+                                    </td>
+                                </tr>//-->
+                        </script>
                     </div>
                 </div>
             </div>
@@ -1532,11 +1569,16 @@
     var workClientBankRowIdx = 0,
         workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
         workClientBankTplFirst = $("#workClientBankTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+    workClientBankTplTechnology = $("#workClientBankTplTechnology").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
     $(document).ready(function () {
-        var dataBank = ${fns:toJson(info)};
+        var dataBank = ${fns:toJson(consultantinfo)};
+        var projectGrade = '${projectGrade}';
         for (var i = 0; i < dataBank.length; i++) {
             if(i == 0){
                 addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTplFirst, dataBank[i]);
+            }else if(i ==1 && projectGrade == 1){
+                addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTplTechnology, dataBank[i]);
+
             }else{
                 addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
             }
@@ -1545,10 +1587,35 @@
     });
 
     function consultant(id, workClientBankRowIdx, workClientBankTpl) {
+        var projectGrade = '${projectGrade}';
         //根据id查询咨询员列表现有数据量
         var length = $("#reportedConsultantList").find("tr").length;
         if(length == 0){
             addRow(id, workClientBankRowIdx, workClientBankTplFirst, "");
+        }else if(length ==1 && projectGrade == 1){
+            var bzshbUserId = $("#bzshbUserId").val();
+            if(undefined == bzshbUserId || null == bzshbUserId || '' == bzshbUserId){
+                parent.layer.msg("请先选择审核人员!", {icon: 5});
+                return false;
+            }else{
+                addRow(id, length, workClientBankTplTechnology, "");
+                var bzshbUserId = $("#bzshbUserId").val();
+                $.ajax({
+                    type:"post",
+                    url:'${ctx}/ruralProject/ruralCostProjectMessage/getWorkUserBYJudgement',
+                    data:{"id":bzshbUserId},
+                    dataType:"json",
+                    success:function(result){
+                        console.log(result)
+                        $("#reportedConsultantList2_zixunyuan").val(result.zixunyuanId);
+                        $("#reportedConsultantList2_zixunyuanName").val(result.zixunyuanName);
+                        $("#reportedConsultantList2_zhucezigezhID").val(result.num);
+                        $("#reportedConsultantList2_zhucezigezhKey").val(result.name);
+                        $("#reportedConsultantList2_major").val(result.major);
+                        $("#reportedConsultantList2_idCard").val(result.idCard);
+                    }
+                })
+            }
         }else{
             addRow(id, workClientBankRowIdx, workClientBankTpl, "");
         }

src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -414,7 +414,7 @@
 											</c:when>
 											<c:otherwise>
 												<tr>
-													<td colspan="6" align="center">
+													<td colspan="8" align="center">
 														暂无数据
 													</td>
 												</tr>