岗位方案审核

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

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

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

@@ -0,0 +1,27 @@
+package com.ruoyi.common.enums;
+
+public enum DeptCode {
+
+    DEPT_HR("10010712", "人力资源部"),
+    DEPT_ICFA("50007343", "内控法务部");
+
+
+    private final String code;
+    private final String info;
+
+    DeptCode(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ruoyi-postcheck/pom.xml

@@ -30,6 +30,11 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <!-- system系统模块 -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -2,8 +2,17 @@ package com.ruoyi.postCheck.controller;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
+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.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,9 +46,16 @@ import io.swagger.annotations.ApiImplicitParam;
 @RestController
 @RequestMapping("/postCheck/programme")
 public class PostProgrammeController extends BaseController {
+
     @Autowired
     private IPostProgrammeService postProgrammeService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
     /**
      * 查询岗检方案列表
      */
@@ -188,6 +204,26 @@ public class PostProgrammeController extends BaseController {
     @Log(title = "岗检方案审核-HR", businessType = BusinessType.UPDATE)
     @PutMapping("/approveHr")
     public AjaxResult approveHr(Long id, Integer statusHr, String reasonHr) {
+        // 判断当前状态
+        PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
+        // 审核过得不在审核
+
+        if (postProgramme.getStatusHr() == 3) {
+            return error("审核失败，请勿重复审核！");
+        }
+        // 判断审核的权限
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 当前登录用户的部门id 查询岗位id是否在内
+        SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
+        if (!sysDept.getDeptCode().equals(DeptCode.DEPT_HR.getCode())) {
+            return error("审核权限有误，请联系管理员！");
+        }
+
+        // 判断岗位是否在权限范围内
+        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
+        if (sysPost.getPostLevel() != 1) {
+            return error("审核权限有误，请联系管理员！");
+        }
         return toAjax(postProgrammeService.approveHr(id, statusHr, reasonHr));
     }
 
@@ -201,6 +237,29 @@ public class PostProgrammeController extends BaseController {
     @Log(title = "岗检方案审核-Icfa", businessType = BusinessType.UPDATE)
     @PutMapping("/approveIcfa")
     public AjaxResult approveIcfa(Long id, Integer statusIcfa, String reasonIcfa) {
+        // 判断当前状态
+        PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
+        // 审核过得不在审核
+        if (postProgramme.getStatusHr() != 3) {
+            return error("审核失败，审核流程有误！！");
+        }
+
+        if (postProgramme.getStatusIcfa() == 3) {
+            return error("审核失败，请勿重复审核！");
+        }
+        // 判断审核的权限
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 当前登录用户的部门id 查询岗位id是否在内
+        SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
+        if (!sysDept.getDeptCode().equals(DeptCode.DEPT_ICFA.getCode())) {
+            return error("审核权限有误，请联系管理员！");
+        }
+        // 判断岗位是否在权限范围内
+        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
+        if (sysPost.getPostLevel() != 1) {
+            return error("审核权限有误，请联系管理员！");
+        }
+
         return toAjax(postProgrammeService.approveIcfa(id, statusIcfa, reasonIcfa));
     }
 }

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

@@ -116,4 +116,8 @@ public class PostProgramme extends BaseEntity {
     @TableField(value = "dept_name")
     @Excel(name = "提交部门名称")
     private String deptName;
+
+    @ApiModelProperty("步骤：0-初始状态；1-人力资源审核后；2-内控法务部；3-方案入档")
+    @TableField(value = "step")
+    private Integer step;
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.constant.PostCheckedProblemEnum;
 import com.ruoyi.common.constant.PostPlanEnum;
 import com.ruoyi.common.constant.PostProgrammeEnum;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, PostProgramme> implements IPostProgrammeService {
+
     @Autowired
     private PostProgrammeMapper postProgrammeMapper;
 
@@ -116,7 +118,6 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         if (id == null || statusHr == null) {
             return 0;
         }
-
         //状态错误
         if (statusHr != PostProgrammeEnum.STATUS_HR_PASS.getValue() && statusHr != PostProgrammeEnum.STATUS_HR_BACK.getValue()) {
             return 0;
@@ -127,45 +128,26 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
             return 0;
         }
 
-        //TODO 待开发：权限和顺序判断
-        //TODO 待开发：权限和顺序判断
-        //TODO 待开发：权限和顺序判断
-        //TODO 待开发：权限和顺序判断
-        //TODO 待开发：权限和顺序判断
-
-        //        1、当前状态是否允许修改
-
-        //        、、
-        //        、、
-        //        、、
-        //        、、
-        //        、、
-        //2、当前用户是否有权限
-        //、、
-        //、、
-        //、、
-        //、、
-        //、、
-        //、、
         PostProgramme data = new PostProgramme();
+
         data.setId(id);
         data.setStatusHr(statusHr);
         data.setReasonHr(reasonHr);
-
+        data.setDateHr(DateUtils.getNowDate());
+        data.setStatusHrUserId(SecurityUtils.getUserId());
         if (statusHr == PostPlanEnum.STATUS_HR_PASS.getValue()) {
             data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
+            data.setStep(PostProgrammeEnum.STEP_HR.getValue());
         } else {
             data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
         }
-
-
         return postProgrammeMapper.updatePostProgramme(data);
     }
 
     /**
      * 审核2：岗检方案审核-Icfa
      *
-     * @param id         主键ID
+     * @param id       主键ID
      * @param statusIcfa 2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；
      * @param reasonIcfa 2-内控法务部审批-未通过理由
      * @return
@@ -176,30 +158,26 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         if (id == null || statusIcfa == null) {
             return 0;
         }
-
         //状态错误
         if (statusIcfa != PostProgrammeEnum.STATUS_ICFA_PASS.getValue() && statusIcfa != PostProgrammeEnum.STATUS_ICFA_BACK.getValue()) {
             return 0;
         }
-
         //未写理由
         if (statusIcfa == PostProgrammeEnum.STATUS_ICFA_BACK.getValue() && StringUtils.isBlank(reasonIcfa)) {
             return 0;
         }
 
-        //TODO 待开发：权限、顺序 判断
-        //TODO 待开发：权限、顺序 判断
-        //TODO 待开发：权限、顺序 判断
-        //TODO 待开发：权限、顺序 判断
-        //TODO 待开发：权限、顺序 判断
-
-
-
         PostProgramme data = new PostProgramme();
+
         data.setId(id);
         data.setStatusIcfa(statusIcfa);
         data.setReasonIcfa(reasonIcfa);
         data.setStatus(statusIcfa);//最终审核结果
+        data.setStep(PostProgrammeEnum.STEP_ICFA.getValue());
+        data.setStatusIcfaUserId(SecurityUtils.getUserId());
+        data.setDateIcfa(DateUtils.getNowDate());
         return postProgrammeMapper.updatePostProgramme(data);
+
+
     }
 }

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

@@ -29,10 +29,11 @@
         <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="selectPostProgrammeVo">
-        select id, name, submit_date, status_hr, date_hr, reason_hr, status_icfa, date_icfa, reason_icfa, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id, disk_path, dept_id, dept_name, status, status_time, status_user_id, status_icfa_user_id, status_hr_user_id from post_programme
+        select id, name, submit_date, status_hr, date_hr, reason_hr, status_icfa, date_icfa, reason_icfa, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id, disk_path, dept_id, dept_name, status, status_time, status_user_id, status_icfa_user_id, status_hr_user_id, step from post_programme
     </sql>
 
     <select id="selectPostProgrammeList" parameterType="PostProgramme" resultMap="PostProgrammeResult">
@@ -90,6 +91,7 @@
             <if test="statusUserId != null">status_user_id,</if>
             <if test="statusIcfaUserId != null">status_icfa_user_id,</if>
             <if test="statusHrUserId != null">status_hr_user_id,</if>
+            <if test="step != null">step,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -116,6 +118,7 @@
             <if test="statusUserId != null">#{statusUserId},</if>
             <if test="statusIcfaUserId != null">#{statusIcfaUserId},</if>
             <if test="statusHrUserId != null">#{statusHrUserId},</if>
+            <if test="step != null">#{step},</if>
         </trim>
     </insert>
 
@@ -145,6 +148,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>

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

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dept_code,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}