清单审核

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2023
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: c:/ruoyi/uploadPath
+  profile: c:/gnhz/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

ruoyi-common/src/main/java/com/ruoyi/common/constant/PostListEnum.java

@@ -5,13 +5,24 @@ package com.ruoyi.common.constant;
  */
 public enum PostListEnum {
 
-//    状态：1-待审核；2-审核中；3-通过；4-驳回；
+    //    状态：1-待审核；2-审核中；3-通过；4-驳回；
     STATUS_WAIT("待审核", 1),
     STATUS_ING("审核中", 2),
     STATUS_PASS("通过；", 3),
-    STATUS_BACK("驳回；", 4);
+    STATUS_BACK("驳回；", 4),
 
 
+//    1-业务职责（人力资源部）
+//    2-党建及党风廉政建设职责（党建工作部）
+//    3-安全环保职责（健康安全环保中心）
+//    4-合规保密职责（内控法务部&办公室）
+//    5-任职资格与能力素质要求（不需要审核）
+
+    TYPE_ONE("业务职责（人力资源部）", 1),
+    TYPE_TWO("党建及党风廉政建设职责（党建工作部）", 2),
+    TYPE_THREE("安全环保职责（健康安全环保中心）", 3),
+    TYPE_FOUR("合规保密职责（内控法务部&办公室）", 4),
+    TYPE_FIVE("任职资格与能力素质要求（不需要审核）", 5);
 
     private String name;
     private Integer value;
@@ -36,4 +47,24 @@ public enum PostListEnum {
     public void setValue(Integer value) {
         this.value = value;
     }
+
+    public static String getTypeView(int type) {
+        switch (type) {
+            case 1:
+                return "业务职责";
+            case 2:
+                return "党建及党风廉政建设职责";
+            case 3:
+                return "安全环保职责";
+            case 4:
+                return "合规保密职责";
+            case 5:
+                return "任职资格与能力素质要求";
+            default:
+                return "Other";
+
+        }
+    }
+
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptCode.java

@@ -2,26 +2,29 @@ package com.ruoyi.common.enums;
 
 public enum DeptCode {
 
-    DEPT_HR("10010712", "人力资源部"),
-    DEPT_ICFA("50007343", "内控法务部");
+    DEPT_HR("10001", "人力资源部"),
+
+    DEPT_PARTY("10002", "党建工作部"),
+
+    DEPT_HSE("10003", "健康安全环保中心"),
+
+    DEPT_ICFA("10004", "内控法务部"),
+    DEPT_OFFICE("10005", "办公室");
 
 
     private final String code;
     private final String info;
 
-    DeptCode(String code, String info)
-    {
+    DeptCode(String code, String info) {
         this.code = code;
         this.info = info;
     }
 
-    public String getCode()
-    {
+    public String getCode() {
         return code;
     }
 
-    public String getInfo()
-    {
+    public String getInfo() {
         return info;
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostListController.java

@@ -4,9 +4,15 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.constant.PostListEnum;
+import com.ruoyi.common.enums.DeptCode;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostListInfo;
 import com.ruoyi.postCheck.domain.tools.PostCheckListType;
+import com.ruoyi.postCheck.domain.tools.PostListApproveTypeUser;
+import com.ruoyi.system.service.ISysPostService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -44,6 +50,9 @@ public class PostListController extends BaseController {
     @Autowired
     private IPostListService postListService;
 
+    @Autowired
+    private ISysPostService sysPostService;
+
     /**
      * 查询岗位责任制清单列表
      */
@@ -137,6 +146,71 @@ public class PostListController extends BaseController {
     }
 
 
+    @ApiOperation("岗位责任制清单审核权限用户列表")
+    @GetMapping("/approveTypeUserList")
+    public AjaxResult approveTypeUserList() {
+        /*
+        [
+            {
+                "type" ：1 // 1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求
+                "userList" : [111111, 222222, 33333] // 用户权限列表
+            },
+            {
+                "type" ：2 // 1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求
+                "userList" : [111111, 222222, 33333] // 用户权限列表
+            },
+            {
+                "type" ：3 // 1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求
+                "userList" : [111111, 222222, 33333] // 用户权限列表
+            },
+            {
+                "type" ：4 // 1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求
+                "userList" : [111111, 222222, 33333] // 用户权限列表
+            }
+        ]
+         */
+
+//        Map<Integer, List<Long>> typeMap = new HashMap<>();
+//        typeMap.put(PostListEnum.TYPE_ONE.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_HR.getCode()));
+//        typeMap.put(PostListEnum.TYPE_TWO.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_PARTY.getCode()));
+//        typeMap.put(PostListEnum.TYPE_THREE.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_HSE.getCode()));
+
+//        List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_ICFA.getCode());
+//        List<Long> userHaveAuthorityListV2 = sysPostService.userHaveAuthorityList(DeptCode.DEPT_OFFICE.getCode());
+//        userHaveAuthorityList.addAll(userHaveAuthorityListV2);
+//        typeMap.put(PostListEnum.TYPE_FOUR.getValue(), userHaveAuthorityList);
+
+        List<PostListApproveTypeUser> typeUserList = new ArrayList<>();
+        PostListApproveTypeUser data1 = new PostListApproveTypeUser(PostListEnum.TYPE_ONE.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_HR.getCode()));
+        PostListApproveTypeUser data2 = new PostListApproveTypeUser(PostListEnum.TYPE_TWO.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_PARTY.getCode()));
+        PostListApproveTypeUser data3 = new PostListApproveTypeUser(PostListEnum.TYPE_THREE.getValue(), sysPostService.userHaveAuthorityList(DeptCode.DEPT_HSE.getCode()));
+        List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_ICFA.getCode());
+        List<Long> userHaveAuthorityListV2 = sysPostService.userHaveAuthorityList(DeptCode.DEPT_OFFICE.getCode());
+        userHaveAuthorityList.addAll(userHaveAuthorityListV2);
+        PostListApproveTypeUser data4 = new PostListApproveTypeUser(PostListEnum.TYPE_FOUR.getValue(), userHaveAuthorityList);
+        typeUserList.add(data1);
+        typeUserList.add(data2);
+        typeUserList.add(data3);
+        typeUserList.add(data4);
+
+        return success(typeUserList);
+    }
+
+
+    @ApiOperation("岗位责任制清单审核")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "审核的类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态：3-通过；4-驳回；", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "reason", value = "未通过理由（驳回时必选）", dataType = "String", dataTypeClass = String.class),
+    })
+    @Log(title = "岗位责任制清单审核", businessType = BusinessType.UPDATE)
+    @PutMapping("/approve")
+    public AjaxResult approve(Integer type, Long id, Integer status, String reason) {
+        return toAjax(postListService.approve(type, id, status, reason));
+    }
+
+
     @ApiOperation("1、检查项目下拉框（不需要参数）")
     @GetMapping("/typeList")
     public AjaxResult typeList(PostCheckListType postCheckListType) {

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostList.java

@@ -126,4 +126,8 @@ public class PostList extends BaseEntity
     @TableField(exist = false)
     private List<PostListInfo> children = new ArrayList<>();
 
+    @ApiModelProperty("未通过理由：明细表的值")
+    @TableField(exist = false)
+    private String reason;
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostListInfo.java

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 岗检责任制清单明细对象 post_list_info
  *
@@ -31,6 +33,11 @@ public class PostListInfo extends BaseEntity
     @Excel(name = "分区域审核-状态：1-待审核；3-通过；4-驳回；")
     private Integer status;
 
+    @ApiModelProperty("状态更新时间")
+    @TableField(value = "status_time")
+    @Excel(name = "状态更新时间")
+    private Date statusTime;
+
     @ApiModelProperty("审核人ID")
     @TableField(value = "status_by_user_id")
     @Excel(name = "审核人ID")
@@ -41,6 +48,11 @@ public class PostListInfo extends BaseEntity
     @Excel(name = "审核人姓名")
     private String statusByUserName;
 
+    @ApiModelProperty("未通过理由")
+    @TableField(value = "reason")
+    @Excel(name = "未通过理由")
+    private String reason;
+
     @ApiModelProperty("岗位责任制清单表ID")
     @TableField(value = "post_list_id")
     @Excel(name = "岗位责任制清单表ID", readConverterExp = "多=")
@@ -96,4 +108,6 @@ public class PostListInfo extends BaseEntity
     @Excel(name = "创建者用户ID")
     private Long createUserId;
 
+
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/tools/PostListApproveTypeUser.java

@@ -0,0 +1,23 @@
+package com.ruoyi.postCheck.domain.tools;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel(value = "岗位责任制清单审核权限用户")
+@Data
+public class PostListApproveTypeUser {
+    @ApiModelProperty("1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求")
+    private Integer type;
+
+    @ApiModelProperty("拥有审核权限的用户数组")
+    private List<Long> userList = new ArrayList<>();
+
+    public PostListApproveTypeUser(Integer type, List<Long> userList) {
+        this.type = type;
+        this.userList = userList;
+    }
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostListService.java

@@ -5,6 +5,9 @@ import java.util.List;
 import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 岗检责任制清单Service接口
@@ -70,4 +73,14 @@ public interface IPostListService extends IService<PostList>
      * @return
      */
     List<PostCheckedItems> contentListByType(Long deptId, Long postId, Integer type);
+
+    /**
+     * 岗位责任制清单审核
+     * @param type 审核的类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
+     * @param id 主键ID
+     * @param status 状态：3-通过；4-驳回；
+     * @param reason 未通过理由（驳回时必选）
+     * @return
+     */
+    int approve(Integer type, Long id, Integer status, String reason);
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostListServiceImpl.java

@@ -1,21 +1,25 @@
 package com.ruoyi.postCheck.service.impl;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.ruoyi.common.constant.PostListEnum;
+import com.ruoyi.common.enums.DeptCode;
+import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.ruoyi.postCheck.mapper.PostListInfoMapper;
 import com.ruoyi.postCheck.service.IPostListInfoService;
+import com.ruoyi.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.StringUtils;
@@ -37,10 +41,15 @@ import org.springframework.util.CollectionUtils;
 public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> implements IPostListService {
     @Autowired
     private PostListMapper postListMapper;
+    @Autowired
+    private PostListInfoMapper postListInfoMapper;
 
     @Autowired
     private IPostListInfoService postListInfoService;
 
+    @Autowired
+    private ISysPostService sysPostService;
+
     /**
      * 查询岗检责任制清单
      *
@@ -100,18 +109,29 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
         //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
 //        if (postList.getId() == null)
         postList.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-
         postList.setCreateDefault();
         postList.setCreationDate(new Date());//编制时间
         postList.setRevisionDate(new Date());//修订时间
         postList.setStatus(PostListEnum.STATUS_WAIT.getValue());//待审核
-
-//        String isConfidential = postList.getIsConfidential();
-//        System.out.println("isConfidential = " + isConfidential);
-
         int rows = postListMapper.insertPostList(postList);
+
         //新增责任制清单明细
         insertPostListInfo(postList);
+
+        //TODO 更新业务职责的状态=待审核：只要部门修改数据，人力资源都需要重新审核单据
+        //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
+        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        //条件
+        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
+        lambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
+        //参数
+        lambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
+        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
+        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+        lambdaUpdateWrapper.set(PostListInfo::getReason, null);
+        postListInfoMapper.update(null, lambdaUpdateWrapper);
+
         return rows;
     }
 
@@ -127,11 +147,40 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
         postList.setUpdateDefault();
         //TODO 待改造，不可以将全部删除完，哪个部门修改了删除那个部门的，其他部门的不能删除。
         //删除明细
-        postListMapper.deletePostListInfoByPostListId(postList.getId());
+//        postListMapper.deletePostListInfoByPostListId(postList.getId());
+        //删除明细：按类型只删除本次包含的主要职责
+        List<PostListInfo> children = postList.getChildren();
+        Map<Integer, List<PostListInfo>> typeMapList = children.stream().collect(Collectors.groupingBy(PostListInfo::getType));
+        Set<Integer> typeList = typeMapList.keySet();
+        if (CollectionUtils.isEmpty(typeList)) {
+            throw new BaseException("请至少设置一项“主要职责”！");
+        }
+        LambdaQueryWrapper<PostListInfo> deleteWrapper = new LambdaQueryWrapper<>();
+        deleteWrapper.eq(PostListInfo::getPostListId, postList.getId());
+        deleteWrapper.in(PostListInfo::getType, typeList);
+        postListInfoMapper.delete(deleteWrapper);
+
         //重新添加
         insertPostListInfo(postList);
 
-        return postListMapper.updatePostList(postList);
+        postList.setStatus(PostListEnum.STATUS_WAIT.getValue());
+        int updateCount = postListMapper.updatePostList(postList);
+
+        //TODO 更新业务职责的状态=待审核：只要部门修改数据，人力资源都需要重新审核单据
+        //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
+        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        //条件
+        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
+        lambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
+        //参数
+        lambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
+        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
+        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+        lambdaUpdateWrapper.set(PostListInfo::getReason, null);
+        postListInfoMapper.update(null, lambdaUpdateWrapper);
+
+        return updateCount;
     }
 
     /**
@@ -168,20 +217,34 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
     public void insertPostListInfo(PostList postList) {
         List<PostListInfo> children = postList.getChildren();
         Long id = postList.getId();
-        if (StringUtils.isNotNull(children)) {
+        if (!CollectionUtils.isEmpty(children)) {
             List<PostListInfo> list = new ArrayList<>();
             for (PostListInfo postListInfo : children) {
+                Integer type = postListInfo.getType();
                 //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
 //                if (postListInfo.getId() == null)
                 postListInfo.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-
-                postListInfo.setCreateDefault();
                 postListInfo.setPostListId(id);
 
+                postListInfo.setCreateDefault();
                 postListInfo.setCreateUserId(SecurityUtils.getUserId());//创建者ID
-                postListInfo.setStatus(PostListEnum.STATUS_WAIT.getValue());//状态，可能需要重新设计，五大部门按类型区分状态
+                //自动审核：任职资格与能力素质要求
+                if (type == PostListEnum.TYPE_FIVE.getValue()) {
+                    postListInfo.setStatus(PostListEnum.STATUS_PASS.getValue());//状态，可能需要重新设计，五大部门按类型区分状态
+                    postListInfo.setStatusByUserId(SecurityUtils.getUserId());
+                    postListInfo.setStatusByUserName(SecurityUtils.getLoginUser().getUser().getNickName());
+                    postListInfo.setReason("Auto");
+                }
+                //其他都是待审核
+                else {
+                    postListInfo.setStatus(PostListEnum.STATUS_WAIT.getValue());//状态，可能需要重新设计，五大部门按类型区分状态
+                }
 
                 list.add(postListInfo);
+                //非业务职责修改时将业务职责设置为待审核
+//                if (postListInfo.getType() != PostListEnum.TYPE_ONE.getValue()) {
+//
+//                }
             }
             if (list.size() > 0) {
                 postListMapper.batchPostListInfo(list);
@@ -201,4 +264,118 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
 
         return postListMapper.contentListByType(deptId, postId, type);
     }
+
+    /**
+     * 岗位责任制清单审核
+     *
+     * @param type   审核的类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
+     * @param id     主键ID
+     * @param status 状态：3-通过；4-驳回；
+     * @param reason 未通过理由（驳回时必选）
+     * @return
+     */
+    @Override
+    public int approve(Integer type, Long id, Integer status, String reason) {
+        if (type == null || id == null || status == null) {
+            throw new BaseException("参数不全，请检查！");
+        }
+        if (status == PostListEnum.STATUS_BACK.getValue() && StringUtils.isBlank(reason)) {
+            throw new BaseException("请填写未通过理由！");
+        }
+
+        if (status == PostListEnum.STATUS_PASS.getValue() && status == PostListEnum.STATUS_BACK.getValue()) {
+            throw new BaseException("状态错误，请检查！");
+        }
+
+        //1、判断权限
+        //1-业务职责（人力资源部）
+        if (type == PostListEnum.TYPE_ONE.getValue()) {
+            List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_HR.getCode());
+            if (!userHaveAuthorityList.contains(SecurityUtils.getUserId())) {
+                throw new BaseException("当前账号无权限，请检查！【" + type + "】");
+            }
+
+        }
+        //2-党建及党风廉政建设职责（党建工作部）
+        else if (type == PostListEnum.TYPE_TWO.getValue()) {
+            List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_PARTY.getCode());
+            if (!userHaveAuthorityList.contains(SecurityUtils.getUserId())) {
+                throw new BaseException("当前账号无权限，请检查！【" + type + "】");
+            }
+        }
+        //3-安全环保职责（健康安全环保中心）
+        else if (type == PostListEnum.TYPE_THREE.getValue()) {
+            List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_HSE.getCode());
+            if (!userHaveAuthorityList.contains(SecurityUtils.getUserId())) {
+                throw new BaseException("当前账号无权限，请检查！【" + type + "】");
+            }
+        }
+        //4-合规保密职责（内控法务部&办公室）
+        else if (type == PostListEnum.TYPE_FOUR.getValue()) {
+            List<Long> userHaveAuthorityList = sysPostService.userHaveAuthorityList(DeptCode.DEPT_ICFA.getCode());
+            List<Long> userHaveAuthorityListV2 = sysPostService.userHaveAuthorityList(DeptCode.DEPT_OFFICE.getCode());
+            userHaveAuthorityList.addAll(userHaveAuthorityListV2);
+
+            if (!userHaveAuthorityList.contains(SecurityUtils.getUserId())) {
+                throw new BaseException("当前账号无权限，请检查！【" + type + "】");
+            }
+        }
+        //不需要审核，新增修改时自动审核的
+        //5-任职资格与能力素质要求（不需要审核）
+//        else if (type == PostListEnum.TYPE_ONE.getValue()) {
+//
+//        }
+        else {
+            throw new BaseException("类型错误，请检查！");
+        }
+
+
+        //2、判断人力资源最后审核
+        if (type == PostListEnum.TYPE_ONE.getValue()) {
+            //查询其他类型待审核的记录
+            LambdaQueryWrapper<PostListInfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PostListInfo::getPostListId, id);
+            queryWrapper.ne(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());//类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
+            queryWrapper.ne(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());//分区域审核-状态：1-待审核；3-通过；4-驳回；
+
+            List<PostListInfo> postListInfoList = postListInfoMapper.selectList(queryWrapper);
+            if (!CollectionUtils.isEmpty(postListInfoList)) {
+                Set<Integer> typeSet = postListInfoList.stream().map(t -> t.getType()).collect(Collectors.toSet());
+                String typeView = "";
+                for (Integer typeIng : typeSet) {
+                    typeView += PostListEnum.getTypeView(typeIng) + "；";
+                }
+                throw new BaseException("以下部门还未审核，请检查！" + typeView);
+            }
+        }
+
+
+        //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
+        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        //条件
+        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, id);
+        lambdaUpdateWrapper.eq(PostListInfo::getType, type);
+        //参数
+        lambdaUpdateWrapper.set(PostListInfo::getStatus, status);
+        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, new Date());
+
+        //通过-参数
+        if (status == PostListEnum.STATUS_PASS.getValue()) {
+            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
+            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
+            lambdaUpdateWrapper.set(PostListInfo::getReason, null);
+        }
+        //驳回-参数
+        else if (status == PostListEnum.STATUS_BACK.getValue()) {
+            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+            lambdaUpdateWrapper.set(PostListInfo::getReason, reason);
+        }
+        int updateCount = postListInfoMapper.update(null, lambdaUpdateWrapper);
+        if (updateCount == 0) {
+            throw new BaseException("更新状态失败，请稍后重试！");
+        }
+
+        return updateCount;
+    }
 }

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostListInfoMapper.xml

@@ -26,19 +26,42 @@
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="createUserId"    column="create_user_id"    />
+        <result property="statusTime"    column="status_time"    />
+        <result property="reason"    column="reason"    />
     </resultMap>
 
     <sql id="selectPostListInfoVo">
         select
-            id, status, status_by_user_id, status_by_user_name, post_list_id, type, sequence_project, level_one, level_two, level_three, level_four, level_five, work_standard,
-            requirement, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id
-        from post_list_info
+            t1.id,
+            t1.status,
+            t1.status_time,
+            t1.reason,
+            t1.status_by_user_id,
+            t1.status_by_user_name,
+            t1.post_list_id,
+            t1.type,
+            t1.sequence_project,
+            t1.level_one,
+            t1.level_two,
+            t1.level_three,
+            t1.level_four,
+            t1.level_five,
+            t1.work_standard,
+            t1.requirement, remark,
+            t1.del_flag,
+            t1.create_time,
+            t1.create_by,
+            t1.update_time,
+            t1.update_by,
+            t1.create_user_id
+        from post_list_info t1
     </sql>
 
     <select id="selectPostListInfoList" parameterType="PostListInfo" resultMap="PostListInfoResult">
         <include refid="selectPostListInfoVo"/>
         <where>
             <if test="status != null "> and status = #{status}</if>
+            <if test="reason != null  and reason != ''"> and reason like concat('%', #{reason}, '%')</if>
             <if test="statusByUserId != null "> and status_by_user_id = #{statusByUserId}</if>
             <if test="statusByUserName != null  and statusByUserName != ''"> and status_by_user_name like concat('%', #{statusByUserName}, '%')</if>
             <if test="postListId != null "> and post_list_id = #{postListId}</if>
@@ -66,6 +89,8 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="status != null">status,</if>
+            <if test="statusTime != null">status_time,</if>
+            <if test="reason != null">reason,</if>
             <if test="statusByUserId != null">status_by_user_id,</if>
             <if test="statusByUserName != null">status_by_user_name,</if>
             <if test="postListId != null">post_list_id,</if>
@@ -89,6 +114,8 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="status != null">#{status},</if>
+            <if test="statusTime != null">#{statusTime},</if>
+            <if test="reason != null">#{reason},</if>
             <if test="statusByUserId != null">#{statusByUserId},</if>
             <if test="statusByUserName != null">#{statusByUserName},</if>
             <if test="postListId != null">#{postListId},</if>
@@ -115,6 +142,8 @@
         update post_list_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="status != null">status = #{status},</if>
+            <if test="statusTime != null">status_time = #{statusTime},</if>
+            <if test="reason != null">reason = #{reason},</if>
             <if test="statusByUserId != null">status_by_user_id = #{statusByUserId},</if>
             <if test="statusByUserName != null">status_by_user_name = #{statusByUserName},</if>
             <if test="postListId != null">post_list_id = #{postListId},</if>

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -100,4 +100,6 @@ public interface SysPostMapper {
     public SysPost checkPostCodeUnique(String postCode);
 
     List<UserPostAuthority> userPostAuthorityList(@Param("deptId") Long deptId, @Param("postLevel") Integer postLevel);
+
+    List<UserPostAuthority> userHaveAuthorityList(@Param("deptCode") String deptCode, @Param("postLevel") Integer postLevel);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -10,8 +10,7 @@ import com.ruoyi.system.domain.UserPostAuthority;
  *
  * @author ruoyi
  */
-public interface ISysPostService
-{
+public interface ISysPostService {
     /**
      * 查询岗位信息集合
      *
@@ -102,16 +101,27 @@ public interface ISysPostService
 
     /**
      * 查询部门经理级别岗位下的人员列表
-     * @param deptId 部门ID
+     *
+     * @param deptId    部门ID
      * @param postLevel 岗位级别：0-不设置；1-经理；
      * @return
      */
-    List<UserPostAuthority> userPostAuthorityList(Long deptId,Integer postLevel);
+    List<UserPostAuthority> userPostAuthorityList(Long deptId, Integer postLevel);
 
     /**
      * 当前登录用户是否为部门经理级别
+     *
      * @param deptId 部门ID
      * @return
      */
-   boolean userHaveAuthority(Long deptId);
+    boolean userHaveAuthority(Long deptId);
+
+
+    /**
+     * 根据部门编码查询经理级别岗位下的用户列表
+     *
+     * @param deptCode 部门编码
+     * @return
+     */
+    List<Long> userHaveAuthorityList(String deptCode);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -203,4 +204,21 @@ public class SysPostServiceImpl implements ISysPostService {
         }
         return false;
     }
+
+    /**
+     * 根据部门编码查询经理级别岗位下的用户列表
+     *
+     * @param deptCode 部门编码
+     * @return
+     */
+    @Override
+    public List<Long> userHaveAuthorityList(String deptCode) {
+        // 判断岗位是否在权限范围内
+        List<UserPostAuthority> userPostAuthorityList = postMapper.userHaveAuthorityList(deptCode, PostLevelEnum.SET_MANAGER.getValue());
+        if (CollectionUtils.isEmpty(userPostAuthorityList)) {
+            return new ArrayList<>();
+        }
+        List<Long> haveAuthorityUserList = userPostAuthorityList.stream().map(t -> t.getUserId()).collect(Collectors.toList());
+        return haveAuthorityUserList;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -158,4 +158,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
+
+	<select id="userHaveAuthorityList"  resultType="UserPostAuthority">
+		SELECT
+			su."user_id" as userId,
+			su."user_name" as userName,
+			su."nick_name" as nickName,
+			sp."post_id" as postId,
+			sp."post_code" as postCode,
+			sp."post_name" as postName,
+			sp."post_level" as postLevel
+		FROM sys_post sp
+		INNER JOIN "sys_dept" sd ON  sd."dept_id" = sp."dept_id"
+		INNER JOIN "sys_user_post" sup ON sup."post_id" = sp."post_id"
+		INNER JOIN "public"."sys_users" su  ON su."user_id"  = sup."user_id"
+		WHERE sd."dept_code" = #{deptCode}
+		AND sp."post_level" = #{postLevel}
+	</select>
+
 </mapper>