项目归档暂存在送审失败修改

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

@@ -1177,9 +1177,19 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }
 
         }
-
+        ProjectRecords projectRecords = new ProjectRecords();
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords, projectRecords);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取合同信息
+        WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+        projectRecords.setWorkContractInfo(projectContractInfo);
+        projectReportRecord.getReport().setProject(projectRecords);
         projectReportRecord.setView("modify");
         model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
         model.addAttribute("project", projectReportRecord.getReport().getProject());
 
         if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
@@ -1202,6 +1212,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             return "modules/projectcontentinfo/projectReportRecordModiftApply";
         }
+        if("1".equals(projectReportRecord.getStatus()) || "3".equals(projectReportRecord.getStatus())){
+            return "modules/ruralprojectrecords/record/cost/projectReportRecordForm";
+        }
         return "modules/ruralprojectrecords/record/cost/projectReportRecordModify";
     }
 }

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

@@ -1173,6 +1173,19 @@ public class RuralProjectMessageNewController extends BaseController {
 
         }
 
+        ProjectRecords projectRecords = new ProjectRecords();
+        try {
+            MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords, projectRecords);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //获取合同信息
+        WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+        projectRecords.setWorkContractInfo(projectContractInfo);
+        projectReportRecord.getReport().setProject(projectRecords);
+        projectReportRecord.setView("modify");
+        model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
+
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
 
@@ -1195,6 +1208,9 @@ public class RuralProjectMessageNewController extends BaseController {
         }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             return "modules/projectcontentinfo/projectReportRecordModiftApply";
         }
+        if("1".equals(projectReportRecord.getStatus()) || "3".equals(projectReportRecord.getStatus())){
+            return "modules/ruralprojectrecords/record/projectReportRecordForm";
+        }
         return "modules/ruralprojectrecords/record/projectReportRecordModify";
     }
 }