Merge remote-tracking branch 'origin/master'

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

@@ -1914,6 +1914,14 @@ public class RuralCostProjectMessageController extends BaseController {
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                                     RedirectAttributes redirectAttributes) {
         try {
+            if (!BaseController.REPORTSWITCH){
+                addMessage(redirectAttributes, "重新申请失败：上报管理员已关闭上报功能");
+                if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
+                    return "redirect:" + Global.getAdminPath() + "/home/?repage";
+                }else {
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                }
+            }
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值

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

@@ -1934,6 +1934,25 @@ public class RuralProjectMessageController extends BaseController {
     public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
                             RedirectAttributes redirectAttributes) {
         try {
+            //判断是否关闭上报功能
+            if (!BaseController.REPORTSWITCH){
+                addMessage(redirectAttributes, "重新申请失败：上报管理员已关闭上报功能");
+                if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
+                    return "redirect:" + Global.getAdminPath() + "/home/?repage";
+                }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+                }else {
+                    RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
+                    if(null != ruralProjectRecords){
+                        if("1".equals(ruralProjectRecords.getProjectType())){
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                        }else if("2".equals(ruralProjectRecords.getProjectType())){
+                            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        }
+                    }
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                }
+            }
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1953,7 +1972,6 @@ public class RuralProjectMessageController extends BaseController {
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
             }else {
                 String str = ruralProjectMessageService.auditSaveReported(t, users);
-
                 addMessage(redirectAttributes, str);
             }
         }catch (Exception e){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1000,6 +1000,7 @@
             <form:hidden path="id"/>
             <form:hidden path="projectId"/>
             <form:hidden path="province"/>
+            <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
             <form:hidden path="act.taskName"/>
             <form:hidden path="act.taskDefKey"/>