B类项目质量复核代码提交

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

@@ -334,12 +334,16 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 it.remove();
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                 if("8".equals(records.getAttachmentProjectSort()) || "1".equals(records.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());
@@ -349,6 +353,7 @@ 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{
@@ -374,6 +379,41 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(StringUtils.isNotBlank(consultantBzshb.getId())){
             consultants.add(consultantBzshb);
         }
+
+        if("8".equals(records.getAttachmentProjectSort()) || "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);
         model.addAttribute("info", consultants);
 

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

@@ -42,7 +42,9 @@ import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
+import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -112,6 +114,8 @@ public class RuralProjectMessageNewController extends BaseController {
     private UserDao userDao;
     @Autowired
     private ProjectPlanService projectPlanService;
+    @Autowired
+    private WorkStaffBasicInfoService workStaffBasicInfoService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -327,17 +331,43 @@ public class RuralProjectMessageNewController extends BaseController {
         //使用迭代器去除重复信息
         //排除 重新申请|撤销
         Iterator<RuralReportConsultant> it = consultantList.iterator();
+        RuralReportConsultant consultantBzshb = new RuralReportConsultant();
         while(it.hasNext()){
             RuralReportConsultant consultant = it.next();
-            if(consultant.getZixunyuan().equals(zongshen.getZixunyuan())){
-                it.remove();
-            }else if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+            if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
                 try {
                     MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
                 it.remove();
+            }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                if("1".equals(records.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) {
+                        for (MainDictDetail type : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type.getValue())){
+                                consultant.setMajor(type.getLabel());
+                            }
+                        }
+                    }
+                    User user=userService.get(consultant.getZixunyuan());
+                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanId(user.getId());
+                    consultant.setRole("技术负责人");
+                    consultantBzshb = consultant;
+                    it.remove();
+                }else{
+                    it.remove();
+                }
             }else{
                 //根据用户查询技能信息
                 List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
@@ -355,6 +385,44 @@ public class RuralProjectMessageNewController 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);
         model.addAttribute("info", consultants);
         //添加当前文件服务器类型
@@ -362,6 +430,7 @@ public class RuralProjectMessageNewController extends BaseController {
         model.addAttribute("projectRecords", records);
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         model.addAttribute("projectReportData", projectcontentinfo.getProjectReportData());
+        model.addAttribute("projectGrade", records.getSubmitMoney());
         if (projectReportData != null && projectReportData.getCreateBy() != null && StringUtils.isNotBlank(projectReportData.getCreateBy().getId()) && projectReportData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm";
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
@@ -447,7 +516,25 @@ public class RuralProjectMessageNewController extends BaseController {
                 }
                 it.remove();
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                it.remove();
+                if("1".equals(ruralProjectRecords.getSubmitMoney())){
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    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());
+                            }
+                        }
+                    }
+                    User user=userService.get(consultant.getZixunyuan());
+                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanId(user.getId());
+                }else{
+                    it.remove();
+                }
             }else{
                 //根据用户查询技能信息
                 List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
@@ -557,6 +644,7 @@ public class RuralProjectMessageNewController extends BaseController {
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
         model.addAttribute("info", consultants);
+        model.addAttribute("projectGrade", ruralProjectRecords.getSubmitMoney());
         //获取是否含有上报信息
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
         if(null != reported){

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

@@ -57,9 +57,14 @@
 								return false;
 							}
 						}
+
+						var projectGrade = '${projectGrade}';
 						if (leng1<=1){
 							top.layer.msg("请添加咨询员信息！", {icon: 0});
 							return false;
+						}else if(projectGrade == 1 && leng1<=2){
+							top.layer.msg("请添加咨询员信息！", {icon: 0});
+							return false;
 						}
 						for(var i=0; i<leng; i++) {
 							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
@@ -963,7 +968,8 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block readOnlyFFF">
-							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<%--<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">--%>
+							<select class="form-control judgment layui-input" id="bzshbUserId" lay-filter="bzshbUserIdFilter" name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -1230,6 +1236,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)" class="form-control judgment"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+
+                                    </td>
+                                </tr>//-->
+						</script>
 					</div>
 				</div>
 			</div>
@@ -1927,6 +1970,33 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			})
+
+			layui.form.on('select(bzshbUserIdFilter)', function(data){
+				console.log(data.value); //得到被选中的值
+
+				//根据id查询咨询员列表现有数据量
+				var length = $("#reportedConsultantList").find("tr").length;
+				//行数超过一行则表示已经存在技术负责人列，则可进行替换
+				if(length>1){
+					//根据审核人员id查询信息并对数据进行替换
+					$.ajax({
+						type:"post",
+						url:'${ctx}/ruralProject/ruralCostProjectMessage/getWorkUserBYJudgement',
+						data:{"id":data.value},
+						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);
+						}
+					})
+				}
+			});
+
 		});
 	})
 </script>
@@ -2258,11 +2328,15 @@
 	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]);
 			}
@@ -2271,10 +2345,36 @@
 	});
 
 	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, workClientBankRowIdx, workClientBankTplTechnology, "");
+				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, "");
 		}