Bläddra i källkod

复核标准页面调整

[user3] 4 år sedan
förälder
incheckning
b4eb1f0d1d

+ 9 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewTwoController.java

@@ -319,6 +319,15 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
                 Act act = getByAct(projectReportData.getProcessInstanceId());
                 Act act = getByAct(projectReportData.getProcessInstanceId());
                 projectReportData.setAct(act);
                 projectReportData.setAct(act);
             }
             }
+            //获取自检的质量复核标准
+            String reviewIds="";
+            if ("2".equals(records.getSubmitMoney())){
+                reviewIds="1";
+            }else{
+                reviewIds="";
+            }
+            List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewIds,"自检");
+            model.addAttribute("workReviews",workReview);
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo";
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo";
         }else if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("costLiu")){
         }else if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("costLiu")){
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo";
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo";

+ 1 - 1
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2664,7 +2664,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						reviewId="1";
 						reviewId="1";
 					}else{
 					}else{
-						reviewId="2";
+						reviewId="";
 					}
 					}
 					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"自检");
 					List<WorkReviewAudit> workReview = projectContentDataService.findListReview(reviewId,"自检");
 					if (null!=workReview){
 					if (null!=workReview){