报告签发项目组成员展示信息

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

@@ -3325,6 +3325,7 @@ public class WorkProjectNotifyController extends BaseController {
 							bzshbConsultant.setZixunyuanName(bzshbUser.getName());
 							bzshbConsultant.setZixunyuan(bzshbUser.getId());
 						}
+
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
 						while(itView.hasNext()){
 							RuralReportConsultant consultant = itView.next();
@@ -3732,7 +3733,122 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					model.addAttribute("datalist", workReviewAuditList);
 
+					//根据项目id查找咨询员信息
+					List<RuralReportConsultant> consultants = Lists.newArrayList();
+					//将自己添加到咨询员数据中
+					//根据用户查询技能信息
+					RuralReportConsultant currentConsultant = new RuralReportConsultant();
+					List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+					if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+						userCertificateList = ruralProjectMessageService.getCertificateByUser(ruralProjectRecords.getProjectMasterId());
+					}
+					//获取专业类型
+					List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+					for (WorkStaffCertificate certificateInfo: userCertificateList) {
+						currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+						currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+						for (MainDictDetail typeInfo : certificateMajor) {
+							if(certificateInfo.getMajor().equals(typeInfo.getValue())){
+								currentConsultant.setMajor(typeInfo.getLabel());
+							}
+						}
+						User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+						currentConsultant.setZixunyuanName(currentUser.getName());
+						currentConsultant.setZixunyuan(currentUser.getId());
+						currentConsultant.setRole("负责人");
+						consultants.add(currentConsultant);
+					}
+					//根据项目id查找报告咨询员信息
+					List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(data.getProject().getId());
+					//使用迭代器去除重复信息
+					//排除 重新申请|撤销
+					Iterator<RuralReportConsultant> it = consultantList.iterator();
+					while(it.hasNext()){
+						RuralReportConsultant consultant = it.next();
+						if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
+							try {
+								MyBeanUtils.copyBeanNotNull2Bean(consultant, currentConsultant);
+							} catch (Exception e) {
+								e.printStackTrace();
+							}
+							it.remove();
+						}else{
+							//根据用户查询技能信息
+							List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+							for (WorkStaffCertificate certificateInfo: certificateList) {
+								if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+									consultant.setZhucezigezhID(certificateInfo.getNum());
+								}
+								for (MainDictDetail typeInfo : certificateMajor) {
+									if(certificateInfo.getMajor().equals(typeInfo.getValue())){
+										consultant.setMajor(typeInfo.getLabel());
+									}
+								}
+							}
+							User zixunyuanUser=userService.get(consultant.getZixunyuan());
+							consultant.setZixunyuanName(zixunyuanUser.getName());
+							consultant.setRole("咨询员");
+						}
+					}
+					consultants.addAll(consultantList);
+					//查询总审人员信息
+					RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
+					List<WorkStaffCertificate> bzshbCertificateList = Lists.newArrayList();
+					if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+						bzshbCertificateList = ruralProjectMessageService.getCertificateByUser(data.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(data.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(data.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 bzshUser=userService.get(data.getBzshbUserId());
+						bzshbConsultant.setZixunyuanName("陈红星("+bzshUser.getName()+"代)");
+						bzshbConsultant.setZixunyuan(bzshUser.getId());
+						bzshbConsultant.setRole("技术负责人");
+						consultants.add(bzshbConsultant);
+					}
+					model.addAttribute("consultantinfo", consultants);
+					model.addAttribute("consultantCount", consultants.size());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();

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

@@ -1071,6 +1071,65 @@
 							</div>
 						</div>
 					</div>
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>项目组成员(质量控制流程)</h2></div>
+						<div class="layui-item layui-col-sm12 lw6">
+							<div class="layui-item nav-btns">
+								<table id="bankinfo1" class="table table-bordered table-condensed can-edit">
+									<thead>
+									<tr>
+										<th width="60px">编号</th>
+										<th >成员名称</th>
+										<th >角色</th>
+										<th >注册/资格证号</th>
+										<th >专业</th>
+										<th >本人负责内容</th>
+										<th >审核意见</th>
+											<%--								<th width="100px">操作</th>--%>
+									</tr>
+									</thead>
+									<tbody id="reportedConsultantList">
+									<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+										<tr>
+											<td width="60px">
+												<input readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+											</td>
+											<td>
+												<input readonly="true"  value="${info.zixunyuanName}" class="form-control"/>
+											</td>
+
+											<td>
+												<input readonly="true"  value="${info.role}" class="form-control"/>
+											</td>
+											<td>
+												<input readonly="true"  value="${info.zhucezigezhID}" class="form-control"/>
+											</td>
+											<td>
+												<input readonly="true"   value="${info.major}" class="form-control"/>
+											</td>
+											<td>
+												<input readonly="true" placeholder="请输入本人负责内容"  value="${info.wordnr}" class="form-control"/>
+											</td>
+											<td>
+												<c:choose>
+													<c:when test="${consultantCount == status.index+1}">
+														<input readonly="true" style="background-color: #FFFFFF;"  value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control "/>
+													</c:when>
+													<c:otherwise>
+														<input readonly="true"  value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control"/>
+													</c:otherwise>
+												</c:choose>
+
+											</td>
+										</tr>
+									</c:forEach>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+
+
 					<c:if test="${projectRecords.submitMoney=='2' || (projectRecords.submitMoney=='1' && (0==projectRecords.emergencyProject || null==projectRecords.emergencyProject))}">
 						<div style="overflow: hidden">
 							<div class="form-group-label">