项目报告、报告归档流程调用中的伪状态问题

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

@@ -469,7 +469,7 @@ public class RuralCostProjectMessageController extends BaseController {
         String id = requestMap.get("id");
         /*try {*/
             RuralProjectRecords projectRecords = ruralProjectMessageService.get(id);
-            if(3==projectRecords.getProjectReportStatus()){
+            if(3==projectRecords.getProjectReportStatus() || 4==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已撤回，请勿重复撤回");
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
             }else if(5==projectRecords.getProjectReportStatus()){
@@ -694,7 +694,7 @@ public class RuralCostProjectMessageController extends BaseController {
             if(!projectReportRecord.getIsNewRecord()){//编辑表单保存
                 ProjectReportRecord t = projectReportRecordService.get(projectReportRecord.getId());//从数据库取出记录的值
                 if(null != saveAuditFlag){
-                    if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
+                    if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
                         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
                     }

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

@@ -398,12 +398,12 @@ public class RuralProjectMessageController extends BaseController {
         if(null != saveAuditFlag){
             if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
                 addMessage(redirectAttributes, "项目报告已送审，请勿重复送审");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
         }
         if(t.getStatus().equals("5")){
             addMessage(redirectAttributes, "项目报告已登记完成，无法再次送审");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
         }
         try {
             MyBeanUtils.copyBeanNotNull2Bean(projectReportData, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -469,8 +469,8 @@ public class RuralProjectMessageController extends BaseController {
         String id = requestMap.get("id");
         /*try {*/
             RuralProjectRecords projectRecords = ruralProjectMessageService.get(id);
-            if(3==projectRecords.getProjectReportStatus()){
-                addMessage(redirectAttributes, "项目报告已撤回，请勿重复撤回");
+            if(3==projectRecords.getProjectReportStatus() || 4==projectRecords.getProjectReportStatus()){
+                addMessage(redirectAttributes, "项目报告已撤回、驳回，请勿重复操作");
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }else if(5==projectRecords.getProjectReportStatus()){
                 addMessage(redirectAttributes, "项目报告已审批通过，无法撤回");
@@ -697,7 +697,7 @@ public class RuralProjectMessageController extends BaseController {
             if(!projectReportRecord.getIsNewRecord()){//编辑表单保存
                 ProjectReportRecord t = projectReportRecordService.get(projectReportRecord.getId());//从数据库取出记录的值
                 if(null != saveAuditFlag){
-                    if(1 == saveAuditFlag && !t.getStatus().equals("4") && !t.getStatus().equals("5")){
+                    if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
                         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
                     }

src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -257,6 +257,14 @@ public class WorkContractRecordController extends BaseController {
 				addMessage(redirectAttributes, str);
 			}
 		}catch (Exception e){
+			WorkContractRecord contractRecord = workContractRecordService.get(workContractRecord.getId());
+			if(!contractRecord.getStatus().equals("4") && !contractRecord.getStatus().equals("5")){
+				addMessage(redirectAttributes, "合同归档已送审，请勿重复送审");
+				return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
+			}else if(contractRecord.getStatus().equals("5")){
+				addMessage(redirectAttributes, "合同归档已登记完成，无法再次送审");
+				return "redirect:"+Global.getAdminPath()+"/workcontractinfo/workContractInfo/?repage";
+			}
 			addMessage(redirectAttributes, "审批失败");
 		}