|
|
@@ -3707,12 +3707,67 @@ 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);
|
|
|
+ //获取总审人员
|
|
|
+ User user=UserUtils.get(projectReportData.getBzshbUserId());
|
|
|
+ model.addAttribute("bzshbUserName",user.getName());
|
|
|
+ //质量复核标准展示
|
|
|
+ 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(projectReportData.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())) {
|
|
|
projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
|
|
|
projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
|
[user3]