问题整改状态调整

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

@@ -4,39 +4,32 @@ package com.ruoyi.common.constant;
  * 岗检问题状态枚举
  */
 public enum PostCheckedProblemEnum {
-    //状态：
-    // 1-待指定整改人（问题录入完成时）；
-    // 2-待填写方案（部门管理员指定整改人后）；
-//            3-方案填写完成；
-    // 10-部门审核通过；
-    // 11-部门审核驳回；
-    // 20-专业部门人审核（非必填）通过；
-    // 21-专业部门人审核驳回（非必填）；
-    // 30-整改人待上传实施（整改人上传实施图片）
-//            31-上传实施照片完成；
-    // 40-复查部门人审核通过；
-    // 41-复查部门人审核驳回
-
-
-
-
-
-
-    ADD("待指定整改人（问题录入完成时）；", 1),
-    EDIT_ONE("待填写方案（部门管理员指定整改人后）；", 2),
-    EDIT_ONE_OVER("方案填写完成", 2),
-
-    DEPT_PASS("部门审核通过；", 10),
-    DEPT_BACK("部门审核驳回；", 11),
-
-    ZHUAN_YE_PASS("专业部门人审核（非必填）通过；", 20),
-    ZHUAN_YE_BACK("专业部门人审核驳回（非必填）；", 21),
-
-    EDIT_TWO("整改人待上传实施（整改人上传实施图片）", 30),
-    EDIT_TWO_OVER("上传实施照片完成", 30),
-
-    FU_CHA_PASS("复查部门人审核通过；", 40),
-    FU_CHA_BACK("复查部门人审核驳回", 41);
+//	  1-待指定整改人（问题录入完成时）；2-待填写方案（部门管理员指定整改人后）；
+//    10-待部门审核；11-部门审核驳回；
+//    20-待专业部门人审核（非必填）；21-专业部门人审核驳回（非必填）；
+//    30-待整改人待上传实施（整改人上传实施图片）；
+//    40-待复查部门人审核；41-复查部门人审核通过；42-复查部门人审核驳回
+
+    ADD("待指定整改人（问题录入完成时）", 1),
+    EDIT_WAIT_ONR("待填写方案（部门管理员指定整改人后）", 2),
+//    EDIT_ONE_OVER("方案填写完成", 2),
+
+    DEPT_WAIT("待部门审核", 10),
+    //TODO 前台传过来的审核状态，数据库并不保存，部门审核通过后，单据流转到专业部门待审核或者方案待填写
+    DEPT_PASS("部门审核通过", 11),
+    DEPT_BACK("部门审核驳回", 12),
+
+    ZHUAN_ZY_WAIT("待专业部门人审核（非必填）", 20),
+    //TODO 前台传过来的审核状态，数据库并不保存，专业部门审核通过后，单据流转到待整改人待上传实施
+    ZHUAN_ZY_PASS("专业部门人审核通过（非必填）", 21),
+    ZHUAN_ZY_BACK("专业部门人审核驳回（非必填）；", 22),
+
+    EDIT_WAIT_TWO("待整改人待上传实施（整改人上传实施图片）", 30),
+    EDIT_TWO_OVER("上传实施照片完成", 31),
+
+    FU_CHA_WAIT("待复查部门人审核；", 40),
+    FU_CHA_PASS("复查部门人审核通过；", 41),
+    FU_CHA_BACK("复查部门人审核驳回", 42);
 
     private String name;
     private Integer value;

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

@@ -89,7 +89,7 @@ public class PostCheckedProblemController extends BaseController {
     public TableDataInfo list(PostCheckedProblem postCheckedProblem) {
 
 //        startPage();
-        startPage("desc","t1.create_time");
+        startPage("desc", "t1.create_time");
         List<PostCheckedProblem> list = postCheckedProblemService.selectPostCheckedProblemList(postCheckedProblem);
         return getDataTable(list);
     }
@@ -277,13 +277,13 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "rectificationMeasure", value = "整改措施/建议", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "rectificationResponsibleUserId", value = "整改责任人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "rectificationResponsibleUserId", value = "整改责任人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "rectificationPeriod", value = "整改期限", dataType = "Date", dataTypeClass = Date.class),
     })
     @Log(title = "方案整改", businessType = BusinessType.UPDATE)
     @PutMapping("/updateRectificationMeasure")
-    public AjaxResult updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod) {
-        return toAjax(postCheckedProblemService.updateRectificationMeasure(id, problemCause, isImmediatelyCorrected, rectificationMeasure, rectificationResponsibleUserId, rectificationPeriod));
+    public AjaxResult updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Date rectificationPeriod) {
+        return toAjax(postCheckedProblemService.updateRectificationMeasure(id, problemCause, isImmediatelyCorrected, rectificationMeasure, rectificationPeriod));
     }
 
 
@@ -299,7 +299,6 @@ public class PostCheckedProblemController extends BaseController {
     }
 
 
-
     @ApiOperation("步骤4->审核1：部门经理审核")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
@@ -309,11 +308,10 @@ public class PostCheckedProblemController extends BaseController {
     @Log(title = "审核1：部门经理审核", businessType = BusinessType.UPDATE)
     @PutMapping("/setDeptApproveTime")
     public AjaxResult setDeptApproveTime(Long id, Integer status, String reason) {
-        return toAjax(postCheckedProblemService.setDeptApproveTime(id, status,  reason));
+        return toAjax(postCheckedProblemService.setDeptApproveTime(id, status, reason));
     }
 
 
-
     @ApiOperation("步骤5->审核2：专业部门审核人审核")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
@@ -323,7 +321,7 @@ public class PostCheckedProblemController extends BaseController {
     @Log(title = "审核2：专业部门审核人审核", businessType = BusinessType.UPDATE)
     @PutMapping("/setSpecialityDepartmentReviewTime")
     public AjaxResult setSpecialityDepartmentReviewTime(Long id, Integer status, String reason) {
-        return toAjax(postCheckedProblemService.setSpecialityDepartmentReviewTime(id, status,  reason));
+        return toAjax(postCheckedProblemService.setSpecialityDepartmentReviewTime(id, status, reason));
     }
 
 
@@ -367,7 +365,6 @@ public class PostCheckedProblemController extends BaseController {
     }
 
 
-
     @ApiOperation("Tools-1、按问题属性分组统计问题类别")
     @GetMapping("/problemCategoryByAttribute")
     public AjaxResult problemCategoryByAttribute(ProblemCategory noParam) {

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

@@ -101,11 +101,11 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
      * @param problemCause                   问题原因
      * @param isImmediatelyCorrected         是否立行立改(1-Yes；2-No；)
      * @param rectificationMeasure           整改措施/建议
-     * @param rectificationResponsibleUserId 整改责任人ID
+     * param rectificationResponsibleUserId 整改责任人ID
      * @param rectificationPeriod            整改期限
      * @return
      */
-    int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod);
+    int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure,Date rectificationPeriod);
 
     /**
      * 指定专业部门的审核人

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

@@ -11,11 +11,17 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.constant.PostCheckedProblemEnum;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.ruoyi.postCheck.domain.PostAssessmentRules;
 import com.ruoyi.postCheck.domain.PostList;
@@ -41,7 +47,9 @@ import com.ruoyi.postCheck.mapper.PostListMapper;
 import com.ruoyi.postCheck.mapper.PostPlanInfoMapper;
 import com.ruoyi.postCheck.mapper.PostPlanMapper;
 import com.ruoyi.postCheck.service.IPostPlanJoinProblemService;
-//import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.UserPostAuthority;
+import com.ruoyi.system.service.ISysPostService;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,14 +63,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.context.request.FacesWebRequest;
 
 
-
-
-
-
-
-
-
-
 /**
  * 岗检问题表Service业务层处理
  *
@@ -88,6 +88,9 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Autowired
     private PostAssessmentRatingOtherMapper postAssessmentRatingOtherMapper;
 
+    @Autowired
+    private ISysPostService sysPostService;
+
     /**
      * 查询岗检问题表
      *
@@ -140,10 +143,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         int count = 0;
         for (PostCheckedProblem postCheckedProblem : postCheckedProblemList) {
             count++;
-            //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-//            if (postCheckedProblem.getId() == null)
             postCheckedProblem.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-            // postCheckedProblem.setCreateTime(DateUtils.getNowDate());
             postCheckedProblem.setCreateDefault();
 
             postCheckedProblem.setProblemNo("GJ-" + DateUtils.getTime());
@@ -152,6 +152,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
             postCheckedProblem.setCheckedDeptId(checkedDeptId);
             //检查时间取值=岗检计划的开始时间
             postCheckedProblem.setCheckTime(checkTime);
+            postCheckedProblem.setStatus(PostCheckedProblemEnum.ADD.getValue());
 
             int insertCount = postCheckedProblemMapper.insertPostCheckedProblem(postCheckedProblem);
             if (insertCount == 0) {
@@ -161,6 +162,43 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         return 1;
     }
 
+    /**
+     * 修改岗检问题表
+     *
+     * @param postCheckedProblemList 岗检问题集合
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updatePostCheckedProblem(List<PostCheckedProblem> postCheckedProblemList) {
+        if (CollectionUtils.isEmpty(postCheckedProblemList)) {
+            return 0;
+        }
+        int count = 0;
+        for (PostCheckedProblem postCheckedProblem : postCheckedProblemList) {
+            count++;
+            //只允许新增状态单据修改
+            PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(postCheckedProblem.getId());
+            if (dataDb == null) {
+                throw new BaseException("id错误或为空，请检查！");
+            }
+            Integer status = dataDb.getStatus();
+            if (status != null && status != PostCheckedProblemEnum.ADD.getValue()) {
+                throw new BaseException("当前状态无法修改，请检查！");
+            }
+
+            // postCheckedProblem.setUpdateTime(DateUtils.getNowDate());
+
+            postCheckedProblem.setUpdateDefault();
+            postCheckedProblem.setStatus(PostCheckedProblemEnum.ADD.getValue());
+            int updateCount = postCheckedProblemMapper.updatePostCheckedProblem(postCheckedProblem);
+            if (updateCount == 0) {
+                throw new BaseException("第" + count + "行更新失败请检查！");
+            }
+        }
+        return 1;
+    }
+
     public void jobInspectionScore(List<PostCheckedProblem> postCheckedProblemList) {
         /**
          * 业务职责有效性 1
@@ -231,35 +269,6 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
 
 
     /**
-     * 修改岗检问题表
-     *
-     * @param postCheckedProblemList 岗检问题集合
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int updatePostCheckedProblem(List<PostCheckedProblem> postCheckedProblemList) {
-        if (CollectionUtils.isEmpty(postCheckedProblemList)) {
-            return 0;
-        }
-        int count = 0;
-        for (PostCheckedProblem postCheckedProblem : postCheckedProblemList) {
-            count++;
-            if (postCheckedProblem.getId() == null) {
-                throw new BaseException("id为空请检查！");
-            }
-            // postCheckedProblem.setUpdateTime(DateUtils.getNowDate());
-            postCheckedProblem.setUpdateDefault();
-            int updateCount = postCheckedProblemMapper.updatePostCheckedProblem(postCheckedProblem);
-            if (updateCount == 0) {
-                throw new BaseException("第" + count + "行更新失败请检查！");
-            }
-        }
-        return 1;
-    }
-
-
-    /**
      * 批量删除岗检问题表
      *
      * @param ids 需要删除的岗检问题表主键
@@ -292,48 +301,153 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Transactional(rollbackFor = Exception.class)
     public int setRectificationResponsibleUserId(String ids, Long rectificationResponsibleUserId) {
         if (StringUtils.isBlank(ids) || rectificationResponsibleUserId == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+
+
         String[] idArr = ids.split(",");
         if (idArr.length == 0) {
-            return 0;
+            throw new BaseException("id错误或为空，请检查！");
         }
+
+
+        String errorMsg = "";
+        List<PostCheckedProblem> dataList = new ArrayList<>(idArr.length);
+        int index = 0;
+        for (String idStr : idArr) {
+            index++;
+            Long id = Long.parseLong(idStr);
+
+            PostCheckedProblem dataDB = postCheckedProblemMapper.selectById(id);
+            if (dataDB == null) {
+                errorMsg += "【第" + index + "行】id错误或为空，请检查！";
+                continue;
+            }
+            Integer status = dataDB.getStatus();
+            if (status != null && status != PostCheckedProblemEnum.ADD.getValue()) {
+                errorMsg += "【第" + index + "行】当前状态无法指定整改责任人，请检查！";
+                continue;
+            }
+
+            Long checkedDeptId = dataDB.getCheckedDeptId();//责任部门ID
+            if (!checkedDeptId.equals(deptId)) {
+                errorMsg += "【第" + index + "行】请切换问题责任部门经理操作01！";
+                continue;
+            }
+
+            // 当前登录用户是否为部门经理级别
+            boolean userHaveAuthority = sysPostService.userHaveAuthority(deptId);
+            if (!userHaveAuthority) {
+                errorMsg += "【第" + index + "行】请切换问题责任部门经理操作02！";
+                continue;
+            }
+            dataList.add(dataDB);
+        }
+        if (StringUtils.isNotBlank(errorMsg)) {
+            throw new BaseException(errorMsg);
+        }
+
+
+        PostCheckedProblem updateData = new PostCheckedProblem();
+        updateData.setStatus(PostCheckedProblemEnum.EDIT_WAIT_ONR.getValue());//待填写方案
+        updateData.setRectificationResponsibleUserId(rectificationResponsibleUserId);//整改责任人
+        LambdaUpdateWrapper<PostCheckedProblem> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.in(PostCheckedProblem::getId, idArr);
+        int updateCount = postCheckedProblemMapper.update(updateData, updateWrapper);
+        if (updateCount != idArr.length) {
+            throw new BaseException("更新行数与请求行数不匹配，请检查！");
+        }
+        return updateCount;
+
+
+        /*
         int count = 0;
         for (String idStr : idArr) {
+            index++;
             Long id = Long.parseLong(idStr);
+
+            PostCheckedProblem dataDB = postCheckedProblemMapper.selectById(id);
+            if (dataDB == null) {
+                throw new BaseException("id错误或为空，请检查！");
+            }
+            Integer status = dataDB.getStatus();
+            if (status != null && status != PostCheckedProblemEnum.ADD.getValue()) {
+                throw new BaseException("当前状态无法指定整改责任人，请检查！");
+            }
+
+            Long checkedDeptId = dataDB.getCheckedDeptId();//责任部门ID
+            if (!checkedDeptId.equals(deptId)) {
+                throw new BaseException("请切换问题责任部门经理操作【第" + index + "行】！");
+            }
+
+            // 当前登录用户是否为部门经理级别
+            boolean userHaveAuthority = sysPostService.userHaveAuthority(deptId);
+            if (!userHaveAuthority) {
+                throw new BaseException("请切换问题责任部门经理操作【第" + index + "行】！");
+            }
+
+
             PostCheckedProblem data = new PostCheckedProblem();
             data.setId(id);
-            data.setStatus(PostCheckedProblemEnum.EDIT_ONE.getValue());//待填写方案
+            data.setStatus(PostCheckedProblemEnum.EDIT_WAIT_ONR.getValue());//待填写方案
             data.setRectificationResponsibleUserId(rectificationResponsibleUserId);
             count += postCheckedProblemMapper.updatePostCheckedProblem(data);
         }
         return count;
+        * */
     }
 
     /**
-     * 方案整改：整改实施人填写方案
+     * 方案整改：整改责任人填写方案
      *
-     * @param id                             问题主键
-     * @param problemCause                   问题原因
-     * @param isImmediatelyCorrected         是否立行立改(1-Yes；2-No；)
-     * @param rectificationMeasure           整改措施/建议
-     * @param rectificationResponsibleUserId 整改责任人ID
-     * @param rectificationPeriod            整改期限
+     * @param id                     问题主键
+     * @param problemCause           问题原因
+     * @param isImmediatelyCorrected 是否立行立改(1-Yes；2-No；)
+     * @param rectificationMeasure   整改措施/建议
+     *                               param rectificationResponsibleUserId 整改责任人ID
+     * @param rectificationPeriod    整改期限
      * @return
      */
     @Override
-    public int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod) {
+//    public int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod) {
+    public int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Date rectificationPeriod) {
 
-        if (id == null || StringUtils.isBlank(problemCause) || isImmediatelyCorrected == null || StringUtils.isBlank(rectificationMeasure) || rectificationResponsibleUserId == null || rectificationPeriod == null) {
-            return 0;
+//        if (id == null || StringUtils.isBlank(problemCause) || isImmediatelyCorrected == null || StringUtils.isBlank(rectificationMeasure) || rectificationResponsibleUserId == null || rectificationPeriod == null) {
+        if (id == null || StringUtils.isBlank(problemCause) || isImmediatelyCorrected == null || StringUtils.isBlank(rectificationMeasure) || rectificationPeriod == null) {
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
+        }
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDB = postCheckedProblemMapper.selectById(id);
+        if (dataDB == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+        Integer status = dataDB.getStatus();
+        if (status != PostCheckedProblemEnum.EDIT_WAIT_ONR.getValue()) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + status + "】");
         }
+
+        Long rectificationResponsibleUserId = dataDB.getRectificationResponsibleUserId();
+        if (!rectificationResponsibleUserId.equals(userId)) {
+            throw new BaseException("请切换整改责任人账号操作！");
+        }
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
         data.setProblemCause(problemCause);
         data.setIsImmediatelyCorrected(isImmediatelyCorrected);
         data.setRectificationMeasure(rectificationMeasure);
-        data.setRectificationResponsibleUserId(rectificationResponsibleUserId);
+//        data.setRectificationResponsibleUserId(rectificationResponsibleUserId);
         data.setRectificationPeriod(rectificationPeriod);
+        data.setStatus(PostCheckedProblemEnum.DEPT_WAIT.getValue());//DEPT_WAIT("待部门审核", 10),
 
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
@@ -348,11 +462,34 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public int setSpecialityDepartmentReviewerId(Long id, Long specialityDepartmentReviewerId) {
         if (id == null || specialityDepartmentReviewerId == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
+        }
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDB = postCheckedProblemMapper.selectById(id);
+        if (dataDB == null) {
+            throw new BaseException("id错误或为空，请检查！");
         }
+        Integer status = dataDB.getStatus();
+        if (status != PostCheckedProblemEnum.ADD.getValue()
+                && status != PostCheckedProblemEnum.EDIT_WAIT_ONR.getValue()
+                && status != PostCheckedProblemEnum.DEPT_WAIT.getValue()
+        ) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + status + "】");
+        }
+        Long rectificationResponsibleUserId = dataDB.getRectificationResponsibleUserId();
+        if (!rectificationResponsibleUserId.equals(userId)) {
+            throw new BaseException("请切换整改责任人账号操作！");
+        }
+
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
         data.setSpecialityDepartmentReviewerId(specialityDepartmentReviewerId);
+//        data.setStatus(PostCheckedProblemEnum);
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
 
@@ -368,25 +505,71 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public int setDeptApproveTime(Long id, Integer status, String reason) {
         if (id == null || status == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
 
         //状态错误
         if (status != PostCheckedProblemEnum.DEPT_PASS.getValue() && status != PostCheckedProblemEnum.DEPT_BACK.getValue()) {
-            return 0;
+//            return 0;
+            throw new BaseException("状态参数错误，请检查！【" + status + "】");
         }
 
-
         //驳回时必须填写原因
         if (status == PostCheckedProblemEnum.DEPT_BACK.getValue() && StringUtils.isBlank(reason)) {
-            return 0;
+            throw new BaseException("未通过理由为空，请检查！");
         }
 
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(id);
+        if (dataDb == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+
+        Integer statusDB = dataDb.getStatus();
+        if (statusDB != PostCheckedProblemEnum.DEPT_WAIT.getValue()) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + statusDB + "】");
+        }
+
+        Long checkedDeptId = dataDb.getCheckedDeptId();//责任部门ID
+        if (!checkedDeptId.equals(deptId)) {
+            throw new BaseException("请切换问题责任部门经理操作01！");
+        }
+
+        // 当前登录用户是否为部门经理级别
+        boolean userHaveAuthority = sysPostService.userHaveAuthority(deptId);
+        if (!userHaveAuthority) {
+            throw new BaseException("请切换问题责任部门经理操作02！");
+        }
+
+
+        //专业部门的审核人ID
+        Long specialityDepartmentReviewerId = dataDb.getSpecialityDepartmentReviewerId();
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
-        data.setStatus(status);
         data.setReason(reason);
         data.setDeptApproveTime(new Date());
+        //通过
+        if (status == PostCheckedProblemEnum.DEPT_PASS.getValue()) {
+            // ZHUAN_ZY_WAIT("待专业部门人审核（非必填）", 20),
+            if (specialityDepartmentReviewerId != null) {
+                data.setStatus(PostCheckedProblemEnum.ZHUAN_ZY_WAIT.getValue());
+            }
+            //EDIT_WAIT("待整改人待上传实施（整改人上传实施图片）", 30),
+            else {
+                data.setStatus(PostCheckedProblemEnum.EDIT_WAIT_TWO.getValue());
+            }
+        }
+        //驳回
+        else if (status == PostCheckedProblemEnum.DEPT_BACK.getValue()) {
+            data.setStatus(PostCheckedProblemEnum.DEPT_BACK.getValue());
+        }
+
+
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
 
@@ -401,25 +584,54 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public int setSpecialityDepartmentReviewTime(Long id, Integer status, String reason) {
         if (id == null || status == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
 
         //状态错误
-        if (status != PostCheckedProblemEnum.ZHUAN_YE_PASS.getValue() && status != PostCheckedProblemEnum.ZHUAN_YE_BACK.getValue()) {
-            return 0;
+        if (status != PostCheckedProblemEnum.ZHUAN_ZY_PASS.getValue() && status != PostCheckedProblemEnum.ZHUAN_ZY_BACK.getValue()) {
+//            return 0;
+            throw new BaseException("状态参数错误，请检查！【" + status + "】");
         }
 
 
         //驳回时必须填写原因
-        if (status == PostCheckedProblemEnum.ZHUAN_YE_BACK.getValue() && StringUtils.isBlank(reason)) {
-            return 0;
+        if (status == PostCheckedProblemEnum.ZHUAN_ZY_BACK.getValue() && StringUtils.isBlank(reason)) {
+//            return 0;
+            throw new BaseException("未通过理由为空，请检查！");
+        }
+
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(id);
+        if (dataDb == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+
+        Integer statusDB = dataDb.getStatus();
+        if (statusDB != PostCheckedProblemEnum.ZHUAN_ZY_WAIT.getValue()) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + statusDB + "】");
         }
 
+        Long specialityDepartmentReviewerId = dataDb.getSpecialityDepartmentReviewerId();
+        if (!specialityDepartmentReviewerId.equals(userId)) {
+            throw new BaseException("请切换专业部门审核人操作！");
+        }
+
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
-        data.setStatus(status);
         data.setReason(reason);
         data.setSpecialityDepartmentReviewTime(new Date());
+
+        if (status == PostCheckedProblemEnum.ZHUAN_ZY_PASS.getValue()) {
+            data.setStatus(PostCheckedProblemEnum.EDIT_WAIT_TWO.getValue());
+        } else if (status == PostCheckedProblemEnum.ZHUAN_ZY_BACK.getValue()) {
+            data.setStatus(PostCheckedProblemEnum.ZHUAN_ZY_BACK.getValue());
+        }
+
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
 
@@ -436,16 +648,38 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     public int updateRectificationCompletionImg(Long id, Integer isRectificationCompleted, Date rectificationCompletionTime, String rectificationCompletionImg) {
 
         if (id == null || isRectificationCompleted == null || StringUtils.isBlank(rectificationCompletionImg)) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
         if (rectificationCompletionTime == null)
             rectificationCompletionTime = new Date();
 
+
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(id);
+        if (dataDb == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+        Integer status = dataDb.getStatus();
+        if (status != PostCheckedProblemEnum.EDIT_WAIT_TWO.getValue()) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + status + "】");
+        }
+
+        Long rectificationResponsibleUserId = dataDb.getRectificationResponsibleUserId();
+        if (!rectificationResponsibleUserId.equals(userId)) {
+            throw new BaseException("请切换整改责任人账号操作！");
+        }
+
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
         data.setIsRectificationCompleted(isRectificationCompleted);
         data.setRectificationCompletionTime(rectificationCompletionTime);
         data.setRectificationCompletionImg(rectificationCompletionImg);
+        data.setStatus(PostCheckedProblemEnum.EDIT_TWO_OVER.getValue());
 
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
@@ -460,11 +694,33 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public int setReviewDepartmentReviewerId(Long id, Long reviewDepartmentReviewerId) {
         if (id == null || reviewDepartmentReviewerId == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
+
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(id);
+        if (dataDb == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+        Integer status = dataDb.getStatus();
+        if (status != PostCheckedProblemEnum.EDIT_WAIT_TWO.getValue()
+                && status != PostCheckedProblemEnum.EDIT_TWO_OVER.getValue()
+        ) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + status + "】");
+        }
+        Long rectificationResponsibleUserId = dataDb.getRectificationResponsibleUserId();
+        if (!rectificationResponsibleUserId.equals(userId)) {
+            throw new BaseException("请切换整改责任人账号操作！");
+        }
+
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
         data.setReviewDepartmentReviewerId(reviewDepartmentReviewerId);
+        data.setStatus(PostCheckedProblemEnum.FU_CHA_WAIT.getValue());
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }
 
@@ -479,26 +735,48 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public int setReviewDepartmentReviewerTime(Long id, Integer status, String reviewConclusion, String reason) {
         if (id == null || status == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
 
         //状态错误
         if (status != PostCheckedProblemEnum.FU_CHA_PASS.getValue() && status != PostCheckedProblemEnum.FU_CHA_BACK.getValue()) {
-            return 0;
+//            return 0;
+            throw new BaseException("状态参数错误，请检查！【" + status + "】");
         }
 
 
         //驳回时必须填写原因
         if (status == PostCheckedProblemEnum.FU_CHA_BACK.getValue() && StringUtils.isBlank(reason)) {
-            return 0;
+//            return 0;
+            throw new BaseException("未通过理由为空，请检查！");
+        }
+
+        //TODO 审核权限：部门经理操作
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Long deptId = loginUser.getDeptId();
+        PostCheckedProblem dataDb = postCheckedProblemMapper.selectById(id);
+        if (dataDb == null) {
+            throw new BaseException("id错误或为空，请检查！");
+        }
+        Integer statusDB = dataDb.getStatus();
+        if (statusDB != PostCheckedProblemEnum.FU_CHA_WAIT.getValue()) {
+            throw new BaseException("当前状态不允许此操作，请检查！【" + status + "】");
+        }
+
+        //复查部门的审核人ID
+        Long reviewDepartmentReviewerId = dataDb.getReviewDepartmentReviewerId();
+        if (!reviewDepartmentReviewerId.equals(userId)) {
+            throw new BaseException("请切换复查人账号操作！");
         }
 
         PostCheckedProblem data = new PostCheckedProblem();
         data.setId(id);
-        data.setStatus(status);
         data.setReviewConclusion(reviewConclusion);
         data.setReason(reason);
         data.setReviewDepartmentReviewerTime(new Date());
+        data.setStatus(status);
         return postCheckedProblemMapper.updatePostCheckedProblem(data);
     }