项目管理

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

@@ -682,9 +682,9 @@ public class RuralCostProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -695,7 +695,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "修改报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
     /**
      * 查询管理员变更的所有新增报告数据信息
@@ -949,7 +949,7 @@ public class RuralCostProjectMessageController extends BaseController {
             //将审核人员id放入报告信息中
             if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId()) && StringUtils.isBlank(reportData.getBzshbUserId())){
                 addMessage(redirectAttributes, "审核人员未选择，请重新发起请求");
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
             }
             if(null != reportData){
                 if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
@@ -957,10 +957,10 @@ public class RuralCostProjectMessageController extends BaseController {
                 }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 } else if(reportData.getStatus().equals("5")){
                     addMessage(redirectAttributes, "报告已审核完毕，请勿再次送审");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
@@ -1090,7 +1090,7 @@ public class RuralCostProjectMessageController extends BaseController {
             ruralProjectMessageService.deleteReport(projectReportData,attachmentList);
         }
         addMessage(redirectAttributes, "删除成功");
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1657,7 +1657,7 @@ public class RuralCostProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -1671,11 +1671,11 @@ public class RuralCostProjectMessageController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -1695,7 +1695,7 @@ public class RuralCostProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档失败");
             logger.error("保存报告归档失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
 
@@ -1719,7 +1719,7 @@ public class RuralCostProjectMessageController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
             //添加暂存判定
             projectReportRecord.setFlag("1");
@@ -1741,7 +1741,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 ProjectReportRecord reportRecord = projectReportRecordService.getprojectReportRecord(projectReportRecord.getReport().getId());//从数据库取出记录的值
                 if(null != reportRecord){
                     addMessage(redirectAttributes, "报告归档已存在，请勿重复提交");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
                 ruralProjectMessageService.saveProjectReportRecord(projectReportRecord,variables,processInstanceId);//保存
             }
@@ -1750,7 +1750,7 @@ public class RuralCostProjectMessageController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("保存报告归档暂存失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1768,7 +1768,7 @@ public class RuralCostProjectMessageController extends BaseController {
             //删除归档信息
             ruralProjectMessageService.deleteRecord(projectReportRecordInfo);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1826,14 +1826,14 @@ public class RuralCostProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回报告归档成功");
                 }else{
                     addMessage(redirectAttributes, "报告归档不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回报告归档失败");
             logger.error("强制撤回归档信息失败",e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1854,9 +1854,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 }else{
                     addMessage(redirectAttributes, "报告归档资料缺失说明不是送审状态，无法撤回");
                     if (StringUtils.isNotBlank(defectRecord.getView()) && defectRecord.getView().equals("zixun")){
-                        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
+                        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
                     }
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
         }catch (Exception e){
@@ -1864,9 +1864,9 @@ public class RuralCostProjectMessageController extends BaseController {
             logger.error("强制撤回归档资料缺失说明失败",e);
         }
         if (StringUtils.isNotBlank(defectRecord.getView()) && defectRecord.getView().equals("zixun")){
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&compnyType="+companyType;
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -1996,7 +1996,7 @@ public class RuralCostProjectMessageController extends BaseController {
         String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -2014,7 +2014,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -2028,7 +2028,7 @@ public class RuralCostProjectMessageController extends BaseController {
         String companyType = reported.getCompanyType();
         if(!BaseController.REPORTSWITCH){
             addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
@@ -2046,7 +2046,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }else {
             addMessage(redirectAttributes, "项目上报暂存成功");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
     /**
@@ -2101,14 +2101,14 @@ public class RuralCostProjectMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回项目上报成功");
                 }else{
                     addMessage(redirectAttributes, "项目上报不是送审状态，无法撤回");
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回项目上报失败");
             logger.error("强制撤回项目上报信息失败",e);
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 
 
@@ -2128,7 +2128,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
                 }else {
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                 }
             }
             ruralProjectMessageService.disposeList(reported);
@@ -2161,9 +2161,9 @@ public class RuralCostProjectMessageController extends BaseController {
         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&compnyType="+companyType;
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage&companyType="+companyType;
         }else {
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
     }
 
@@ -2231,7 +2231,7 @@ public class RuralCostProjectMessageController extends BaseController {
             logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "案卷号变更失败");
         }
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&compnyType="+companyType;
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }