待审核-费用申请批量审批

src/main/java/com/liang/common/enums/PostInfoEnum.java

@@ -0,0 +1,43 @@
+package com.liang.common.enums;
+
+/**
+ * @author by lgl
+ * @date 2024/6/7.
+ */
+public enum PostInfoEnum {
+    BMZR("10", "部门主任"),
+    KJBBMZR("8", "科技部部门主任"),
+    ZGYLD("7", "主管院领导"),
+    YZ("6", "院长"),
+    KYJHZZ("5", "科研计划专责"),
+    FYZ("2", "副院长"),
+    FZR("11", "副主任"),
+    KYCGGLZZ("12", "科研成果管理专责"),
+    KYFZR("13", "科研负责人"),
+    KYDLR("14", "科研代理人"),
+    KYZZ("15", "科研专责"),
+    XXJSS("16", "信息技术室"),
+    KJBZR("17", "科技部主任"),
+    KJXMGLZZ1("17", "科技项目管理专责1"),
+    KJXMGLZZ2("18", "科技项目管理专责2"),
+    KJXMGLZZ3("18", "科技项目管理专责3"),
+    KYJHGLZZ("19", "科研计划管理专责"),
+    KJXMGLZZ("9", "科技项目管理专责"),
+    ;
+
+    private String postCode;
+    private String postName;
+
+    PostInfoEnum(String postCode, String postName) {
+        this.postCode = postCode;
+        this.postName = postName;
+    }
+
+    public String postCode() {
+        return postCode;
+    }
+
+    public String postName() {
+        return postName;
+    }
+}

src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.enums.ProjectTypeEnnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.entity.*;
@@ -194,7 +195,7 @@ public class PrjAnnualbudgetController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -640,8 +641,7 @@ public class PrjAnnualbudgetController extends BaseController {
     public String forApproveAdd(Model model) {
         //部门主任岗位
         Map<String, String> paraMap = new HashMap<>();
-//        paraMap.put("postName", "部门主任");
-        paraMap.put("postName", "科技项目管理专责");
+        paraMap.put("postName", PostInfoEnum.KJXMGLZZ.postName());
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null)
             postInfo = new SysPostInfo();
@@ -703,7 +703,7 @@ public class PrjAnnualbudgetController extends BaseController {
 
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科技项目管理专责");
+            paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)
@@ -745,7 +745,7 @@ public class PrjAnnualbudgetController extends BaseController {
 
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科技项目管理专责");
+            paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.entity.*;
 import com.liang.service.PrjApproverecordService;
 import com.liang.service.StaBudgetapprovalService;
@@ -509,7 +510,7 @@ public class PrjApproverecordController extends BaseController {
             } else if (staBudgetapproval.getSfbyj() == true && staBudgetapproval.getXmmc() == null && "审批结束".equals(staBudgetapproval.getSpzt()) || "".equals(staBudgetapproval.getXmmc())) {
                 prjApproverecord.setWc(false);
                 prjApproverecord.setZt("该备用金暂未关联项目");
-                prjApproverecord.setShrxm("科技项目管理专责");
+                prjApproverecord.setShrxm(PostInfoEnum.KJXMGLZZ.postName());
                 list.add(prjApproverecord);
             }
         }

src/main/java/com/liang/controller/PrjProjectController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.common.utils.MoneyToChineseUtil;
 import com.liang.common.utils.StringUtils;
@@ -667,10 +668,7 @@ public class PrjProjectController extends BaseController {
     public String forApproveAdd(Model model) {
         //科研计划专责
         Map<String, String> paraMap = new HashMap<>();
-//        paraMap.put("postName", "科研计划专责");
-//        paraMap.put("postName", "部门主任");
-//        paraMap.put("postName", "科技项目管理专责");
-        paraMap.put("postName", "科研计划专责");
+        paraMap.put("postName", PostInfoEnum.KYJHZZ.postName());
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null)
             postInfo = new SysPostInfo();
@@ -718,7 +716,7 @@ public class PrjProjectController extends BaseController {
 
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科研计划专责");
+            paraMap2.put("postName", PostInfoEnum.KYJHZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)
@@ -746,7 +744,8 @@ public class PrjProjectController extends BaseController {
         paraMap1.put("wc", "0");
         List<PrjApproverecord> approveList = prjApproverecordService.getApproveByXmId(paraMap1);
         if (approveList.size() > 0) {
-            res.put("approveInfo", approveList.get(approveList.size() - 1));
+            PrjApproverecord prjApproverecord = approveList.get(approveList.size() - 1);
+            res.put("approveInfo", prjApproverecord);
         } else {
             PrjProject project = prjProjectService.queryById(xmid);
             PrjApproverecord approveInfo = new PrjApproverecord();
@@ -756,18 +755,6 @@ public class PrjProjectController extends BaseController {
             res.put("approveInfo", approveInfo);
         }
 
-
-        if (spzt.contains("未提交")) {
-            Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科研计划专责");
-
-            SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
-            if (postInfo == null) {
-                postInfo = new SysPostInfo();
-            }
-            res.put("postInfo", postInfo);
-
-        }
         return res;
     }
 
@@ -846,7 +833,7 @@ public class PrjProjectController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -922,7 +909,7 @@ public class PrjProjectController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.entity.*;
 import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
@@ -138,7 +139,7 @@ public class StaBudgetapprovalController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -485,7 +486,7 @@ public class StaBudgetapprovalController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -661,7 +662,7 @@ public class StaBudgetapprovalController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -877,9 +878,9 @@ public class StaBudgetapprovalController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", "副主任");
+            paraMap.put("postName", PostInfoEnum.FZR.postName());
         } else {
-            paraMap.put("postName", "科研负责人");
+            paraMap.put("postName", PostInfoEnum.KYFZR.postName());
         }
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null)
@@ -907,6 +908,37 @@ public class StaBudgetapprovalController extends BaseController {
         if (approveList.size() == 1) {
             PrjApproverecord approveInfo = approveList.get(0);
             approveInfo.setSqje(sqje);
+
+            if (spzt.equals("院长审批") || spzt.equals("主管院领导审批") && sqje < 1000000) {
+                approveInfo.setSpcz("批量审批");
+                approveInfo.setYj("通过");
+            } else {
+                //岗位
+                Map<String, String> paraMap2 = new HashMap<>();
+                if ("部门主任审批".equals(spzt))
+                    paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
+                else if ("科技项目管理专责审批".equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
+                } else if ("科技部部门主任审批".equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.ZGYLD.postName());
+                } else if ("主管院领导审批".equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.YZ.postName());
+                } else {
+                    paraMap2.put("postName", PostInfoEnum.BMZR.postName());
+                }
+                SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
+                if (postInfo == null) {
+                    throw new RuntimeException("没有改岗位");
+                }
+                Map<String, String> paraMap = new HashMap<>();
+                paraMap.put("postId", String.valueOf(postInfo.getPostId()));
+                List<SysUserPost> list = sysUserPostService.getPostUserList(paraMap);
+                approveInfo.setSpcz("批量审批");
+                approveInfo.setSjshgw(postInfo.getPostId());
+                approveInfo.setSjshgwmc(postInfo.getPostName());
+                approveInfo.setSjshr(list.get(0).getUserId());
+                approveInfo.setSjshrxm(list.get(0).getName());
+            }
             res.put("approveInfo", approveInfo);
         } else {
             StaBudgetapproval approve = staBudgetapprovalService.queryById(xmid);
@@ -917,33 +949,13 @@ public class StaBudgetapprovalController extends BaseController {
             approveInfo.setZt("数据不匹配");
             res.put("approveInfo", approveInfo);
         }
+        return res;
 
-        if (spzt.equals("院长审批") || spzt.equals("主管院领导审批") && sqje < 1000000) {
-            return res;
-        } else {
-            //岗位
-            Map<String, String> paraMap2 = new HashMap<>();
-            if (spzt.equals("部门主任审批"))
-                paraMap2.put("postName", "科技项目管理专责");
-            else if (spzt.equals("科技项目管理专责审批"))
-                paraMap2.put("postName", "科技部部门主任");
-            else if (spzt.equals("科技部部门主任审批"))
-                paraMap2.put("postName", "主管院领导");
-            else if (spzt.equals("主管院领导审批"))
-                paraMap2.put("postName", "院长");
-            else {
-                paraMap2.put("postName", "部门主任");
-            }
-
-            SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
-            if (postInfo == null)
-                postInfo = new SysPostInfo();
-            res.put("postInfo", postInfo);
-
-            return res;
-        }
     }
 
+    @Resource
+    private SysUserPostService sysUserPostService;
+
     /**
      * 新建数据(提交审批)
      *
@@ -957,9 +969,9 @@ public class StaBudgetapprovalController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", "副主任");
+            paraMap.put("postName", PostInfoEnum.FZR.postName());
         } else {
-            paraMap.put("postName", "科研负责人");
+            paraMap.put("postName", PostInfoEnum.KYFZR.postName());
         }
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
 
@@ -1017,7 +1029,8 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/forApproveUpdate/{xmid}/{sqje}", method = RequestMethod.GET)
-    public String forApproveUpdate(Model model, @PathVariable Integer xmid, @PathVariable Double sqje, @RequestParam String spzt) {
+    public String forApproveUpdate(Model model, @PathVariable Integer xmid, @PathVariable Double
+            sqje, @RequestParam String spzt) {
         //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         model.addAttribute("userInfo", userInfo);
@@ -1049,21 +1062,16 @@ public class StaBudgetapprovalController extends BaseController {
             //岗位
             Map<String, String> paraMap2 = new HashMap<>();
             if (spzt.equals("部门主任审批"))
-                paraMap2.put("postName", "科技项目管理专责");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
             else if (spzt.equals("科技项目管理专责审批"))
-                paraMap2.put("postName", "科技部部门主任");
+                paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
             else if (spzt.equals("科技部部门主任审批"))
-                paraMap2.put("postName", "主管院领导");
+                paraMap2.put("postName", "PostInfoEnum.ZGYLD.postName()");
             else if (spzt.equals("主管院领导审批"))
-                paraMap2.put("postName", "院长");
+                paraMap2.put("postName", PostInfoEnum.YZ.postName());
             else {
-                paraMap2.put("postName", "部门主任");
+                paraMap2.put("postName", "PostInfoEnum.BMZR.postName()");
             }
-//            if (userInfo != null && userInfo.getDeptId().equals("52")) {
-//                paraMap2.put("postName", "副主任");
-//            } else {
-//                paraMap2.put("postName", "科研负责人");
-//            }
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)
@@ -1091,7 +1099,8 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/forApproveUpdate1/{xmid}/{sqje}", method = RequestMethod.GET)
-    public String forApproveUpdate1(Model model, @PathVariable Integer xmid, @PathVariable Double sqje, @RequestParam String spzt) {
+    public String forApproveUpdate1(Model model, @PathVariable Integer xmid, @PathVariable Double
+            sqje, @RequestParam String spzt) {
         //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         model.addAttribute("userInfo", userInfo);
@@ -1123,20 +1132,20 @@ public class StaBudgetapprovalController extends BaseController {
             Map<String, String> paraMap2 = new HashMap<>();
             if (spzt.equals("未提交(返回)")) {
                 if (userInfo != null && userInfo.getDeptId().equals("52")) {
-                    paraMap2.put("postName", "副主任");
+                    paraMap2.put("postName", PostInfoEnum.FZR.postName());
                 } else {
-                    paraMap2.put("postName", "科研负责人");
+                    paraMap2.put("postName", PostInfoEnum.KYFZR.postName());
                 }
             } else if (spzt.equals("部门主任审批"))
-                paraMap2.put("postName", "科技项目管理专责");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
             else if (spzt.equals("科技项目管理专责审批"))
-                paraMap2.put("postName", "科技部部门主任");
+                paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
             else if (spzt.equals("科技部部门主任审批"))
-                paraMap2.put("postName", "主管院领导");
+                paraMap2.put("postName", "PostInfoEnum.ZGYLD.postName()");
             else if (spzt.equals("主管院领导审批"))
-                paraMap2.put("postName", "院长");
+                paraMap2.put("postName", PostInfoEnum.YZ.postName());
             else
-                paraMap2.put("postName", "部门主任");
+                paraMap2.put("postName", "PostInfoEnum.BMZR.postName()");
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)

src/main/java/com/liang/controller/StaFeasibilityreportController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.common.utils.WordUtils;
 import com.liang.entity.*;
@@ -669,10 +670,8 @@ public class StaFeasibilityreportController extends BaseController {
     @RequestMapping(value = "/forApproveAdd", method = RequestMethod.GET)
     public String forApproveAdd(Model model) {
         Map<String, String> paraMap = new HashMap<>();
-//        paraMap.put("postName", "科研计划专责");
-//        paraMap.put("postName", "部门主任");
-//        paraMap.put("postName", "科技项目管理专责");
-        paraMap.put("postName", "科研计划专责");
+
+        paraMap.put("postName", PostInfoEnum.KYJHZZ.postName());
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null)
             postInfo = new SysPostInfo();
@@ -741,8 +740,8 @@ public class StaFeasibilityreportController extends BaseController {
 
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-//            paraMap2.put("postName", "科技项目管理专责");
-            paraMap2.put("postName", "科研计划专责");
+
+            paraMap2.put("postName", PostInfoEnum.KYJHZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)
@@ -1094,7 +1093,7 @@ public class StaFeasibilityreportController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                     System.out.println("ppppppppppppppppp" + post + i);
                 }
@@ -1179,7 +1178,7 @@ public class StaFeasibilityreportController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                     System.out.println("ppppppppppppppppp" + post + i);
                 }

src/main/java/com/liang/controller/StaPayapprovalController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.entity.*;
 import com.liang.service.*;
@@ -183,7 +184,7 @@ public class StaPayapprovalController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -372,7 +373,7 @@ public class StaPayapprovalController extends BaseController {
     public String forApproveAdd(Model model) {
         //部门主任岗位
         Map<String, String> paraMap = new HashMap<>();
-        paraMap.put("postName", "科技项目管理专责1");
+        paraMap.put("postName", PostInfoEnum.KJXMGLZZ1.postName());
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null)
             postInfo = new SysPostInfo();
@@ -436,11 +437,11 @@ public class StaPayapprovalController extends BaseController {
         } else {
             Map<String, String> paraMap2 = new HashMap<>();
             if (spzt.equals("科技项目管理专责1审批"))
-                paraMap2.put("postName", "科技项目管理专责2");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ2.postName());
             else if (spzt.equals("科技项目管理专责2审批"))
-                paraMap2.put("postName", "科技部部门主任");
+                paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
             else
-                paraMap2.put("postName", "科技项目管理专责1");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ1.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null)
@@ -481,11 +482,11 @@ public class StaPayapprovalController extends BaseController {
         if (!spzt.equals("科技部部门主任审批")) {
             Map<String, String> paraMap2 = new HashMap<>();
             if (spzt.equals("科技项目管理专责1审批")) {
-                paraMap2.put("postName", "科技项目管理专责2");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ2.postName());
             } else if (spzt.equals("科技项目管理专责2审批")) {
-                paraMap2.put("postName", "科技部部门主任");
+                paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
             } else {
-                paraMap2.put("postName", "科技项目管理专责1");
+                paraMap2.put("postName", PostInfoEnum.KJXMGLZZ1.postName());
             }
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);

src/main/java/com/liang/controller/StaReimbursementController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.common.utils.StringUtils;
 import com.liang.dao.PrjAnnualbudgetDao;
@@ -179,7 +180,7 @@ public class StaReimbursementController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -393,8 +394,8 @@ public class StaReimbursementController extends BaseController {
     public String forApproveAdd(Model model) {
         //部门主任岗位
         Map<String, String> paraMap = new HashMap<>();
-//        paraMap.put("postName", "部门主任");
-        paraMap.put("postName", "科技项目管理专责");
+
+        paraMap.put("postName", PostInfoEnum.KJXMGLZZ.postName());
         SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap);
         if (postInfo == null) {
             postInfo = new SysPostInfo();
@@ -466,7 +467,7 @@ public class StaReimbursementController extends BaseController {
 
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科技项目管理专责");
+            paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null) {
@@ -505,7 +506,7 @@ public class StaReimbursementController extends BaseController {
         }
         if (spzt.contains("未提交")) {
             Map<String, String> paraMap2 = new HashMap<>();
-            paraMap2.put("postName", "科技项目管理专责");
+            paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
 
             SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
             if (postInfo == null) {

src/main/java/com/liang/controller/SysUserPostController.java

@@ -1,6 +1,7 @@
 package com.liang.controller;
 
 import com.liang.common.base.BaseController;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.entity.SysPostInfo;
 import com.liang.entity.SysUserInfo;
 import com.liang.entity.SysUserPost;
@@ -105,9 +106,9 @@ public class SysUserPostController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", "副主任");
+            paraMap.put("postName", PostInfoEnum.FZR.postName());
         } else {
-            paraMap.put("postName", "科研负责人");
+            paraMap.put("postName", PostInfoEnum.KYFZR.postName());
         }
 
         List<SysPostInfo> postInfo = sysPostInfoService.getSysPostInfo1(paraMap);

src/main/resources/templates/prjapproverecord/list.html

@@ -417,7 +417,7 @@
 
     function bathSP(data) {
         if (data.tablename == 'sta_FeasibilityReport') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "ysje": data.kysje
@@ -433,7 +433,7 @@
                         success: function (res) {
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": '审批结束'
                             }
                             AjaxUtil.post({
@@ -456,7 +456,7 @@
 
 
         } else if (data.tablename == 'prj_Project') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "ysje": data.rysje
@@ -472,7 +472,7 @@
                         success: function (res) {
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": '审批结束'
                             }
                             AjaxUtil.post({
@@ -494,7 +494,7 @@
                 }
             });
         } else if (data.tablename == 'prj_AnnualBudget') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "xmzys": data.xmzys
@@ -510,7 +510,7 @@
                         success: function (res) {
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": '审批结束'
                             }
                             AjaxUtil.post({
@@ -518,10 +518,7 @@
                                 contentType: "application/json",
                                 data: JSON.stringify(project),
                                 success: function (res) {
-                                    parent.setUpdateFlag();
 
-                                    var iframeIndex = parent.layer.getFrameIndex(window.name);
-                                    parent.layer.close(iframeIndex);
                                 },
                                 error: function (error) {
                                 }
@@ -535,7 +532,7 @@
                 }
             });
         } else if (data.tablename == 'sta_BudgetApproval') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "zt": data.spzt,
@@ -553,7 +550,7 @@
                             console.log(res);
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": ''
                             }
                             if (bathUpdateRes.approveInfo.spcz == '返回修改') {
@@ -565,7 +562,7 @@
                             } else if (bathUpdateRes.approveInfo.zt == '科技部部门主任审批') {
                                 project.spzt = '主管院领导审批';
                             } else if (bathUpdateRes.approveInfo.zt == '主管院领导审批') {
-                                if (xmApproval.sqje < 1000000) {
+                                if (xmApprovalBath.sqje < 1000000) {
                                     project.spzt = '审批结束';
                                 } else {
                                     project.spzt = '院长审批';
@@ -591,7 +588,7 @@
                 }
             });
         } else if (data.tablename == 'sta_Reimbursement') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "zt": data.spzt,
@@ -608,7 +605,7 @@
                         success: function (res) {
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": '审批结束'
                             }
                             AjaxUtil.post({
@@ -629,7 +626,7 @@
                 }
             });
         } else if (data.tablename == 'sta_PayApproval') {
-            xmApproval = {
+            var xmApprovalBath = {
                 "xmid": data.xmid,
                 "xm": data.xm,
                 "zt": data.spzt,
@@ -646,7 +643,7 @@
                         success: function (res) {
                             //更新审批状态
                             var project = {
-                                "id": xmApproval.xmid,
+                                "id": xmApprovalBath.xmid,
                                 "spzt": ''
                             }
                             if (bathUpdateRes.approveInfo.spcz == '返回修改') {