调整

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

@@ -443,32 +443,32 @@ public class RuralProjectViewController extends BaseController {
         }
         //展示
         //获取自检的质量复核标准
-//        String reviewId="";
-//        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
-//            reviewId="1";
-//        }else{
-//            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
-//                reviewId="2";
-//            }else{
-//                reviewId="3";
-//            }
-//        }
-//        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"质量复核");
         WorkReviewAudit workReviewAudit = new WorkReviewAudit();
         String type = "4";
         workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
-        List<WorkReviewAudit> audits = workReviewStandardService.findDataAuditList(workReviewAudit);
-//        for(WorkReviewAudit reviewAudit:workReviewAudits){
-//            for (WorkReviewAudit audit:audits){
-//                if (reviewAudit.getId().equals(audit.getStandardId())){
-//                    reviewAudit.setDeductOption(audit.getDeductOption());
-//                    break;
-//                }
-//            }
-//        }
-        model.addAttribute("list", audits);
+        List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        for(WorkReviewAudit reviewAudit:workReviewAudits){
+            for (WorkReviewAudit audit:audits){
+                if (reviewAudit.getId().equals(audit.getStandardId())){
+                    reviewAudit.setDeductOption(audit.getDeductOption());
+                    break;
+                }
+            }
+        }
+        model.addAttribute("list", workReviewAudits);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -985,32 +985,32 @@ public class RuralProjectViewController extends BaseController {
         ruralProjectRecords.setBzshbUserList(auditUserList);
         //展示
         //获取自检的质量复核标准
-//        String reviewId="";
-//        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
-//            reviewId="1";
-//        }else{
-//            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
-//                reviewId="2";
-//            }else{
-//                reviewId="3";
-//            }
-//        }
-//        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else{
+                reviewId="3";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
         WorkReviewAudit workReviewAudit = new WorkReviewAudit();
         String type = "4";
         workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
-        List<WorkReviewAudit> audits = workReviewStandardService.findDataTwoAuditList(workReviewAudit);
-//        for(WorkReviewAudit reviewAudit:workReviewAudits){
-//            for (WorkReviewAudit audit:audits){
-//                if (reviewAudit.getId().equals(audit.getStandardId())){
-//                    reviewAudit.setDeductOption(audit.getDeductOption());
-//                    break;
-//                }
-//            }
-//        }
-        model.addAttribute("list", audits);
+        List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        for(WorkReviewAudit reviewAudit:workReviewAudits){
+            for (WorkReviewAudit audit:audits){
+                if (reviewAudit.getId().equals(audit.getStandardId())){
+                    reviewAudit.setDeductOption(audit.getDeductOption());
+                    break;
+                }
+            }
+        }
+        model.addAttribute("list", workReviewAudits);
         model.addAttribute("processInstanceId",projectReportDataTwo.getProcessInstanceId());
         model.addAttribute("projectReportData",projectReportData);
         model.addAttribute("projectReportDataTwo",projectReportDataTwo);