质量流程控制单修改，新增报告咨询员修改

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

@@ -364,15 +364,73 @@ public class RuralProjectViewController extends BaseController {
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                     bzshbConsultant = consultant;
+                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setRole("技术负责人");
                     it.remove();
                 }
             }
         }
         consultants.addAll(consultantList);
 
-
-        bzshbConsultant.setRole("技术负责人");
-        consultants.add(bzshbConsultant);
+        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{
+                User user=userService.get(projectReportData.getBzshbUserId());
+                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuan(user.getId());
+                bzshbConsultant.setRole("技术负责人");
+                consultants.add(bzshbConsultant);
+            }
+        }
 
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -971,8 +971,11 @@ public class WorkFullManageController extends BaseController {
 		}
 		consultants.addAll(consultantList);
 
-
-
+		//如果项目负责人名称为空
+		if(StringUtils.isBlank(bzshbConsultant.getZixunyuanName())){
+			User user=userService.get(projectReportData.getBzshbUserId());
+			bzshbConsultant.setZixunyuanName(user.getName());
+		}
 
 
 		/*//获取咨询员信息
@@ -1123,7 +1126,11 @@ public class WorkFullManageController extends BaseController {
 
 		if(null != projectReportData.getTechnicistDate()){
 			//技术负责人
-			data.put("technicistName",bzshbConsultant.getZixunyuanName());
+			if(StringUtils.isBlank(bzshbConsultant.getZixunyuanName())){
+				data.put("technicistName","");
+			}else{
+				data.put("technicistName",bzshbConsultant.getZixunyuanName());
+			}
 			if(StringUtils.isBlank(bzshbConsultant.getAuditOpinion())){
 				data.put("technicistRemarks","");
 			}else{

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

@@ -2091,17 +2091,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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()));
@@ -2131,17 +2154,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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()));
@@ -2182,17 +2228,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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()));
@@ -2395,17 +2464,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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()));
@@ -2435,17 +2527,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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()));
@@ -2486,17 +2601,40 @@ public class WorkProjectNotifyController extends BaseController {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
-							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
-								try {
-									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setRole("技术负责人");
-								} catch (Exception e) {
-									e.printStackTrace();
+							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();
 								}
-								itView.remove();
 							}
 						}
-						consultants.add(bzshbConsultant);
+
+						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/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -1303,7 +1303,7 @@
 												<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control required"/>
 											</c:when>
 											<c:otherwise>
-												<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" class="form-control required"/>
+												<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control required"/>
 											</c:otherwise>
 										</c:choose>
 
@@ -1574,6 +1574,13 @@
 			}
 		});
 	}
+	function readOpenInfo(value) {
+		layer.open({
+			title: '意见',
+			btn: ['关闭'],
+			content: value
+		});
+	}
 </script>
 </body>
 </html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -35,6 +35,14 @@
 				$("#other_file").click();
 			});
 		});
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '意见',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 
@@ -419,7 +427,7 @@
 										<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
 									</td>
 									<td>
-										<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" class="form-control required"/>
+										<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control"/>
 									</td>
 								</tr>
 							</c:forEach>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -101,6 +101,14 @@
 				}
 			});
 		}
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '意见',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 
@@ -294,7 +302,7 @@
 										<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
 									</td>
 									<td>
-										<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" class="form-control required"/>
+										<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control"/>
 									</td>
 								</tr>
 							</c:forEach>

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

@@ -40,7 +40,7 @@
 						<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<textarea placeholder="请输入审核意见:" id="reimburseRemarks" name="reimburseRemarks" style="width: 100%" rows="7" class="form-control required" maxlength="255">${auditOpinion}</textarea>
+									<textarea placeholder="请输入审核意见:" id="reimburseRemarks" name="reimburseRemarks" style="width: 100%" rows="10" class="form-control required" maxlength="500">${auditOpinion}</textarea>
 									<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 									<input type="file" name="upload_files" style="display: none;">
 								</div>