Merge remote-tracking branch 'origin/master'

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

@@ -3624,7 +3624,6 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
         return consultantInfoList;
     }
-
     /**
      * 上报项目信息处理
      * @param records
@@ -3749,4 +3748,104 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
         }
     }
+
+    /**
+     * 用于EL表达式
+     * 将上报字段的大写改为小写
+     * @param rural
+     * @return
+     */
+    public ProjectRecordsReported reportedAssignment (RuralProjectRecordsReported rural){
+        ProjectRecordsReported projectRecordsReported=new ProjectRecordsReported();
+        projectRecordsReported.setId(rural.getId());
+        projectRecordsReported.setCreateBy(rural.getCreateBy());
+        projectRecordsReported.setUpdateBy(rural.getUpdateBy());
+        projectRecordsReported.setCreateDate(rural.getCreateDate());
+        projectRecordsReported.setUpdateDate(rural.getUpdateDate());
+        projectRecordsReported.setWorkContractInfo(rural.getWorkContractInfo());
+        projectRecordsReported.setWorkContractInfo(rural.getWorkContractInfo());
+        projectRecordsReported.setProjectId(rural.getProjectId());
+        projectRecordsReported.setProjectRecordId(rural.getProjectRecordId());
+        projectRecordsReported.setProjectLeaders(rural.getProjectLeaders());
+        projectRecordsReported.setProjectName(rural.getProjectName());
+        projectRecordsReported.setXmFZR(rural.getXmFZR());
+        projectRecordsReported.setLeaderNameStr(rural.getLeaderNameStr());
+        projectRecordsReported.setWeiTuoDW(rural.getWeiTuoDW());
+        projectRecordsReported.setLianXiDH(rural.getLianXiDH());
+        projectRecordsReported.setTouZiXZ(rural.getTouZiXZ());
+        projectRecordsReported.setProjectType(rural.getProjectType());
+        projectRecordsReported.setHeTongLeiXing(rural.getHeTongLeiXing());
+        projectRecordsReported.setZiXunHTBH(rural.getZiXunHTBH());
+        projectRecordsReported.setDangABH(rural.getDangABH());
+        projectRecordsReported.setBaoGaoShuQianFaDate(rural.getBaoGaoShuQianFaDate());
+        projectRecordsReported.setZiXunShouRu(rural.getZiXunShouRu());
+        projectRecordsReported.setZaoJiaShiZhengHao(rural.getZaoJiaShiZhengHao());
+        projectRecordsReported.setReportedConsultantList(rural.getReportedConsultantList());
+        projectRecordsReported.setS1(rural.getS1());
+        projectRecordsReported.setS2(rural.getS2());
+        projectRecordsReported.setS3(rural.getS3());
+        projectRecordsReported.setPorjectStruct(rural.getPorjectStruct());
+        projectRecordsReported.setFloorUp(rural.getFloorUp());
+        projectRecordsReported.setFloorDown(rural.getFloorDown());
+        projectRecordsReported.setgCGMUnit(rural.getGCGMUnit());
+        projectRecordsReported.setgCGMValue(rural.getGCGMValue());
+        projectRecordsReported.setPorjectUse(rural.getPorjectUse());
+        projectRecordsReported.setZiXunBDE(rural.getZiXunBDE());
+        projectRecordsReported.setZiXunBDETJ(rural.getZiXunBDETJ());
+        projectRecordsReported.setZiXunBDEAZ(rural.getZiXunBDEAZ());
+        projectRecordsReported.setCalTJPercent(rural.getCalTJPercent());
+        projectRecordsReported.setCalAZPercent(rural.getCalAZPercent());
+        projectRecordsReported.setCalZZJUnit(rural.getCalZZJUnit());
+        projectRecordsReported.setCalZZJTJUnit(rural.getCalZZJTJUnit());
+        projectRecordsReported.setCalZZJAZUnit(rural.getCalZZJAZUnit());
+        projectRecordsReported.setHeTongJia(rural.getHeTongJia());
+        projectRecordsReported.setSongShenJia(rural.getSongShenJia());
+        projectRecordsReported.setShenDingJia(rural.getShenDingJia());
+        projectRecordsReported.setJingHeJianE(rural.getJingHeJianE());
+        projectRecordsReported.setJingHeJianLv(rural.getJingHeJianLv());
+        projectRecordsReported.setgCYL(rural.getGCYL());
+        projectRecordsReported.setsNYL(rural.getSNYL());
+        projectRecordsReported.setyBTYL(rural.getYBTYL());
+        projectRecordsReported.setrGGRYL(rural.getRGGRYL());
+        projectRecordsReported.setgCYLPerUnit(rural.getGCYLPerUnit());
+        projectRecordsReported.setsNYLPerUnit(rural.getSNYLPerUnit());
+        projectRecordsReported.setyBTYLPerUnit(rural.getYBTYLPerUnit());
+        projectRecordsReported.setrGGRYLPerUnit(rural.getRGGRYLPerUnit());
+        projectRecordsReported.settJProjectList(rural.getTJProjectList());
+        projectRecordsReported.setzSProjectList(rural.getZSProjectList());
+        projectRecordsReported.setaZProjectList(rural.getAZProjectList());
+        projectRecordsReported.setsZProjectList(rural.getSZProjectList());
+        projectRecordsReported.setfGYLProjectList(rural.getFGYLProjectList());
+        projectRecordsReported.settJProject(rural.getTJProject());
+        projectRecordsReported.setzSProject(rural.getZSProject());
+        projectRecordsReported.setaZProject(rural.getAZProject());
+        projectRecordsReported.setsZProject(rural.getSZProject());
+        projectRecordsReported.setfGYLProject(rural.getFGYLProject());
+        projectRecordsReported.setqTProjec(rural.getQTProjec());
+        projectRecordsReported.setProvince(rural.getProvince());
+        projectRecordsReported.setCity(rural.getCity());
+        projectRecordsReported.setCounty(rural.getCounty());
+        projectRecordsReported.setProcessInstanceId(rural.getProcessInstanceId());
+        projectRecordsReported.setCompany(rural.getCompany());
+        projectRecordsReported.setOffice(rural.getOffice());
+        projectRecordsReported.setReportStatus(rural.getReportStatus());
+        projectRecordsReported.setHome(rural.getHome());
+        projectRecordsReported.setProjectCode(rural.getProjectCode());
+        projectRecordsReported.setProjectSection(rural.getProjectSection());
+        projectRecordsReported.setProjectClassify(rural.getProjectClassify());
+        projectRecordsReported.setgCGMValueParameter(rural.getGCGMValueParameter());
+        projectRecordsReported.setContentsIncludeList(rural.getContentsIncludeList());
+        projectRecordsReported.setContentsInclude(rural.getContentsInclude());
+        projectRecordsReported.setProjectTotalInvestment(rural.getProjectTotalInvestment());
+        projectRecordsReported.setBeginDate(rural.getBeginDate());
+        projectRecordsReported.setEndDate(rural.getEndDate());
+        projectRecordsReported.setArchivesNo(rural.getArchivesNo());
+        projectRecordsReported.setAdvisoryIncome(rural.getAdvisoryIncome());
+        projectRecordsReported.setProjectSupervisionIncome(rural.getProjectSupervisionIncome());
+        projectRecordsReported.setTenderingAgencyIncome(rural.getTenderingAgencyIncome());
+        projectRecordsReported.setDesignIncome(rural.getDesignIncome());
+        projectRecordsReported.setOtherIncome(rural.getOtherIncome());
+        projectRecordsReported.setWorkAttachments(rural.getWorkAttachments());
+        return projectRecordsReported;
+    }
 }

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

@@ -2740,7 +2740,6 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
-					RuralProjectRecords projectRecordPlans=this.planView(projectcontentinfo.getProject().getId());
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("id", projectcontentinfo.getId());
@@ -2750,7 +2749,15 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("consultantCount", consultants.size());
 					model.addAttribute("subProjectInfos", subProjectInfos);
 					model.addAttribute("workContractInfo", workContractInfo);
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans=this.planView(projectcontentinfo.getProject().getId());
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
+
+
 					//获取评分标准
 					//获取自检的质量复核标准
 					String reviewId="";
@@ -3148,7 +3155,23 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
-					RuralProjectRecords projectRecordPlans = this.planView(projectReportDataTwo.getProject().getId());
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					model.addAttribute("processInstanceId", projectReportDataTwo.getProcessInstanceId());
 					model.addAttribute("projectId", projectReportDataTwo.getProject().getId());
 //					model.addAttribute("id", projectcontentinfo.getId());
@@ -3156,11 +3179,39 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("subProjectInfos", subProjectInfos);
 					model.addAttribute("workContractInfo", workContractInfo);
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(projectReportDataTwo.getProject().getId());
 					model.addAttribute("projectRecordPlans", projectRecordPlans);
+					//质量复核标准展示
+					String review="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						review="1";
+					};
+					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
+					WorkReviewAudit revAudit = new WorkReviewAudit();
+					String type = "4";
+					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+					revAudit.setType(type);
+					revAudit.setReportId(data.getId());
+					List<WorkReviewAudit> reaudits = workReviewStandardService.findAuditList(revAudit);
+					for(WorkReviewAudit reAudit:workReviewAuditList){
+						for (WorkReviewAudit audit:reaudits){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalist", workReviewAuditList);
+
+
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-						String type = "4";
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
 						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
@@ -3189,7 +3240,6 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo";
 					} else {
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-						String type = "4";
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
 						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
@@ -4021,12 +4071,42 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					projectReportRecord.setUploadMode(uploadMode);
+					//获取项目基础信息
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("projectReportData", projectReportData);
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(ruralProjectRecords.getId());
+					model.addAttribute("projectRecordPlans", projectRecordPlans);
+					//获取质量复核项目组成员
+					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
+					model.addAttribute("consultantinfo", consultantinfo);
+
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
@@ -5896,6 +5976,134 @@ public class WorkProjectNotifyController extends BaseController {
 		consultants.addAll(consultantList);
 		return consultants;
 	}
+	public List<RuralReportConsultant> qualityView(RuralProjectRecords ruralProjectRecords,ProjectReportData projectReportData) {
+		//质量复核查看
+		List<RuralReportConsultant> consultantinfo = 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 type : certificateMajor) {
+				if(certificateInfo.getMajor().equals(type.getValue())){
+					currentConsultant.setMajor(type.getLabel());
+				}
+			}
+			User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+			currentConsultant.setZixunyuanName(currentUser.getName());
+			currentConsultant.setZixunyuan(currentUser.getId());
+			currentConsultant.setRole("负责人");
+			consultantinfo.add(currentConsultant);
+		}
+		//查询总审人员信息
+		RuralReportConsultant bzshbConsultant = new RuralReportConsultant();
+		//根据项目id查找报告咨询员信息
+		List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(ruralProjectRecords.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 type : certificateMajor) {
+						if(certificateInfo.getMajor().equals(type.getValue())){
+							consultant.setMajor(type.getLabel());
+						}
+					}
+				}
+				User user=userService.get(consultant.getZixunyuan());
+				consultant.setRole("咨询员");
+				consultant.setZixunyuanName(user.getName());
+				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+					bzshbConsultant = consultant;
+					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+					bzshbConsultant.setRole("技术负责人");
+					it.remove();
+				}
+			}
+		}
+		consultantinfo.addAll(consultantList);
 
+		if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+			consultantinfo.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());
+				consultantinfo.add(bzshbConsultant);
+			}
+			Iterator<RuralReportConsultant> itView = consultantinfo.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())){
+				consultantinfo.add(bzshbConsultant);
+			}else{
+				User user=userService.get(projectReportData.getBzshbUserId());
+				bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+				bzshbConsultant.setZixunyuan(user.getId());
+				bzshbConsultant.setRole("技术负责人");
+				consultantinfo.add(bzshbConsultant);
+			}
+		}
+		return consultantinfo;
+	}
 
 }