Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,14 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 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.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;
@@ -41,6 +49,13 @@ public class PostAssessmentRulesController extends BaseController
     @Autowired
     private IPostAssessmentRulesService postAssessmentRulesService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
+
     /**
      * 查询考核规则列表
      */
@@ -167,6 +182,75 @@ public class PostAssessmentRulesController extends BaseController
     @Log(title = "考核规则审核", businessType = BusinessType.UPDATE)
     @PutMapping("/statusApprove")
     public AjaxResult statusApprove(Long id, Integer status, String statusReason) {
+
+        // 判断审核的权限
+        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(postAssessmentRulesService.statusApprove(id, status,  statusReason));
+    }
+
+
+
+    @ApiOperation("考核规则审核-职能")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "status", value = "状态：3-通过；4-驳回；", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "reason", value = "未通过理由", dataType = "String", dataTypeClass = String.class),
+    })
+    @Log(title = "考核规则审核-职能", businessType = BusinessType.UPDATE)
+    @PutMapping("/statusFunctions")
+    public AjaxResult statusFunctions(Long id, Integer status, String statusReason) {
+
+        // 判断审核的权限
+        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(postAssessmentRulesService.statusApprove(id, status,  statusReason));
+    }
+
+
+    @ApiOperation("考核规则审核-生产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "status", value = "状态：3-通过；4-驳回；", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "reason", value = "未通过理由", dataType = "String", dataTypeClass = String.class),
+    })
+    @Log(title = "考核规则审核-生产", businessType = BusinessType.UPDATE)
+    @PutMapping("/statusProduction")
+    public AjaxResult statusProduction(Long id, Integer status, String statusReason) {
+
+        // 判断审核的权限
+        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(postAssessmentRulesService.statusApprove(id, status,  statusReason));
     }
 }

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

@@ -3,6 +3,14 @@ package com.ruoyi.postCheck.controller;
 import java.util.Date;
 import java.util.List;
 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.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;
@@ -40,6 +48,13 @@ public class PostCheckedReportController extends BaseController
     @Autowired
     private IPostCheckedReportService postCheckedReportService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
+
     /**
      * 查询岗检报告管理列表
      */
@@ -211,6 +226,19 @@ public class PostCheckedReportController extends BaseController
     @Log(title = "岗检报告审核", businessType = BusinessType.UPDATE)
     @PutMapping("/statusApprove")
     public AjaxResult statusApprove(Long id, Integer status, String statusReason) {
+
+        // 判断审核的权限
+        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(postCheckedReportService.statusApprove(id, status,  statusReason));
     }
 

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

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.ruoyi.common.constant.PostAssessmentRulesEnum;
 import com.ruoyi.common.constant.PostCheckedReportEnum;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostCheckedReport;
@@ -133,12 +135,16 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
         if (status == PostCheckedReportEnum.STATUS_BACK.getValue() && StringUtils.isBlank(statusReason)) {
             return 0;
         }
-
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = loginUser.getUser();
         PostAssessmentRules data = new PostAssessmentRules();
         data.setId(id);
         data.setStatus(status);
         data.setStatusApproveTime(new Date());
         data.setStatusReason(statusReason);
+        data.setStatusByUserId(sysUser.getUserId());
+        data.setStatusByUserName(sysUser.getUserName());
+        data.setStatusApproveTime(DateUtils.getNowDate());
         return postAssessmentRulesMapper.updatePostAssessmentRules(data);
     }
 }

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

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.ruoyi.common.constant.PostCheckedProblemEnum;
 import com.ruoyi.common.constant.PostCheckedReportEnum;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
@@ -135,17 +137,13 @@ public class PostCheckedReportServiceImpl extends ServiceImpl<PostCheckedReportM
         if (status == PostCheckedReportEnum.STATUS_BACK.getValue() && StringUtils.isBlank(statusReason)) {
             return 0;
         }
-
-        //TODO 权限判断
-        //1、内控法务部审核->部门下的3个经理级别的岗位（部门经理（1个）、部门副经理（2个）、党总支部副书记（1个））下面的人员（4个人）：
-        //
-        //
-        //
-
-
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = loginUser.getUser();
         PostCheckedReport data = new PostCheckedReport();
         data.setId(id);
         data.setStatus(status);
+        data.setStatusByUserId(sysUser.getUserId());
+        data.setStatusByUserName(sysUser.getUserName());
         data.setStatusApproveTime(new Date());
         data.setStatusReason(statusReason);
         return postCheckedReportMapper.updatePostCheckedReport(data);

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

@@ -173,7 +173,9 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         data.setStatusIcfa(statusIcfa);
         data.setReasonIcfa(reasonIcfa);
         data.setStatus(statusIcfa);//最终审核结果
-        data.setStep(PostProgrammeEnum.STEP_ICFA.getValue());
+        if (statusIcfa == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
+            data.setStep(PostProgrammeEnum.STEP_ICFA.getValue());
+        }
         data.setStatusIcfaUserId(SecurityUtils.getUserId());
         data.setDateIcfa(DateUtils.getNowDate());
         return postProgrammeMapper.updatePostProgramme(data);