Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,10 @@ public enum PostPlanEnum {
     STATUS_HR_PASS("通过；", 3),
     STATUS_HR_BACK("驳回；", 4),
 
+    // 流转步骤
+    STEP_HR("人力资源", 2),
+    STEP_ICFA("内控法务", 1),
+    STEP_SCHEME("方案入档",3),
 
     //status_icfa 2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；
     STATUS_ICFA_WAIT("待审核", 1),

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
@@ -188,12 +189,12 @@ public class PostAssessmentRulesController extends BaseController
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
         return toAjax(postAssessmentRulesService.statusApprove(id, status,  statusReason));
@@ -216,12 +217,12 @@ public class PostAssessmentRulesController extends BaseController
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
         return toAjax(postAssessmentRulesService.statusApprove(id, status,  statusReason));
@@ -243,12 +244,12 @@ public class PostAssessmentRulesController extends BaseController
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
         return toAjax(postAssessmentRulesService.statusApprove(id, status,  statusReason));

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
@@ -232,12 +233,12 @@ public class PostCheckedReportController extends BaseController
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         return toAjax(postCheckedReportService.statusApprove(id, status,  statusReason));
     }

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

@@ -4,8 +4,18 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.constant.PostPlanEnum;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.DeptCode;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostPlanCheckUser;
 import com.ruoyi.postCheck.domain.PostPlanInfo;
+import com.ruoyi.postCheck.domain.PostProgramme;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
 import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +46,16 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping("/postCheck/postPlan")
 public class PostPlanController extends BaseController {
+
     @Autowired
     private IPostPlanService postPlanService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
     /**
      * 查询岗检计划列表
      */
@@ -202,6 +219,25 @@ public class PostPlanController extends BaseController {
     @Log(title = "岗检计划审核-Icfa", businessType = BusinessType.UPDATE)
     @PutMapping("/approveIcfa")
     public AjaxResult approveIcfa(Long id, Integer statusIcfa, String reasonIcfa) {
+        // 判断当前状态
+        PostPlan postPlan = postPlanService.selectPostPlanById(id);
+        // 审核过得不在审核
+        if (postPlan.getStatusIcfa() == PostPlanEnum.STATUS_ICFA_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
+        }
+        // 判断审核的权限
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 当前登录用户的部门id 查询岗位id是否在内
+        SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
+        if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+        }
+        // 判断岗位是否在权限范围内
+        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
+        if (sysPost.getPostLevel() != 1) {
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+        }
+
         return toAjax(postPlanService.approveIcfa(id, statusIcfa, reasonIcfa));
     }
 
@@ -217,6 +253,31 @@ public class PostPlanController extends BaseController {
     @Log(title = "岗检计划审核-HR", businessType = BusinessType.UPDATE)
     @PutMapping("/approveHr")
     public AjaxResult approveHr(Long id, Integer statusHr, String reasonHr) {
+        // 判断当前状态
+        PostPlan postPlan = postPlanService.selectPostPlanById(id);
+        // 审核过得不在审核
+        if (postPlan.getStatusHr() == PostPlanEnum.STATUS_HR_PASS.getValue()) {
+            return AjaxResult.error( "审核失败，请勿重复审核！");
+        }
+        // 判断顺序
+        if (postPlan.getStatusIcfa() != PostPlanEnum.STATUS_ICFA_PASS.getValue()
+                && postPlan.getStatus() != PostPlanEnum.STATUS_ING.getValue()) {
+            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
+        }
+        // 判断审核的权限
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 当前登录用户的部门id 查询岗位id是否在内
+        SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
+        if (!sysDept.getDeptCode().equals(DeptCode.DEPT_HR.getCode())) {
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+        }
+
+        // 判断岗位是否在权限范围内
+        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
+        if (sysPost.getPostLevel() != 1) {
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+        }
+
         return toAjax(postPlanService.approveHr(id, statusHr, reasonHr));
     }
 

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.constant.PostProgrammeEnum;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
@@ -208,21 +210,21 @@ public class PostProgrammeController extends BaseController {
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
 
-        if (postProgramme.getStatusHr() == 3) {
-            return error("审核失败，请勿重复审核！");
+        if (postProgramme.getStatusHr() == PostProgrammeEnum.STATUS_HR_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_HR.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         return toAjax(postProgrammeService.approveHr(id, statusHr, reasonHr));
     }
@@ -240,24 +242,25 @@ public class PostProgrammeController extends BaseController {
         // 判断当前状态
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
-        if (postProgramme.getStatusHr() != 3) {
-            return error("审核失败，审核流程有误！！");
+        if (postProgramme.getStatusHr() != PostProgrammeEnum.STATUS_PASS.getValue()
+                && postProgramme.getStatus() == PostProgrammeEnum.STATUS_ING.getValue()) {
+            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
         }
 
-        if (postProgramme.getStatusIcfa() == 3) {
-            return error("审核失败，请勿重复审核！");
+        if (postProgramme.getStatusIcfa() == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
         SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
         if (sysPost.getPostLevel() != 1) {
-            return error("审核权限有误，请联系管理员！");
+            return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
         return toAjax(postProgrammeService.approveIcfa(id, statusIcfa, reasonIcfa));

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

@@ -161,4 +161,9 @@ public class PostPlan extends BaseEntity {
     @TableField(exist = false)
     private String checkedPostNames;
 //    =======================页面显示值===============
+
+    @ApiModelProperty("步骤：0-初始状态；1-内控法务部；2-人力资源审核后；3-方案入档")
+    @TableField(value = "step")
+    private Integer step;
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.DeptConstants;
 import com.ruoyi.common.constant.PostPlanEnum;
+import com.ruoyi.common.constant.PostProgrammeEnum;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.ruoyi.postCheck.domain.PostPlan;
@@ -237,6 +238,7 @@ public class PostPlanServiceImpl extends ServiceImpl<PostPlanMapper, PostPlan> i
         data.setReasonIcfa(reasonIcfa);
 
         if (statusIcfa == PostPlanEnum.STATUS_ICFA_PASS.getValue()) {
+            data.setStep(PostPlanEnum.STEP_ICFA.getValue());
             data.setStatus(PostPlanEnum.STATUS_ING.getValue());//审核中
         } else {
             data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
@@ -274,11 +276,12 @@ public class PostPlanServiceImpl extends ServiceImpl<PostPlanMapper, PostPlan> i
         data.setReasonHr(reasonHr);
 
         data.setStatus(statusHr);//最终审核结果
-        // 初始化岗检考核排名
 
-        if(statusHr==3){
+        if(statusHr==PostPlanEnum.STATUS_ICFA_PASS.getValue()){
+            data.setStep(PostPlanEnum.STEP_HR.getValue());
             // 如果审核通过开始初始化岗检排名表
             initializationPostAssessmentRating(id);
+
         }
         return postPlanMapper.updatePostPlan(data);
     }

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

@@ -30,6 +30,7 @@
         <result property="statusUserId"    column="status_user_id"    />
         <result property="statusIcfaUserId"    column="status_icfa_user_id"    />
         <result property="statusHrUserId"    column="status_hr_user_id"    />
+        <result property="step"    column="step"    />
     </resultMap>
 
     <sql id="selectPostPlanVo">
@@ -182,6 +183,7 @@
             <if test="statusUserId != null">status_user_id = #{statusUserId},</if>
             <if test="statusIcfaUserId != null">status_icfa_user_id = #{statusIcfaUserId},</if>
             <if test="statusHrUserId != null">status_hr_user_id = #{statusHrUserId},</if>
+            <if test="step != null">step = #{step},</if>
         </trim>
         where id = #{id}
     </update>