Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedProblemService.java
#	ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedProblemServiceImpl.java
#	ruoyi-postcheck/src/main/resources/mapper/postCheck/PostProgrammeMapper.xml

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/PostCheckedHomePageController.java

@@ -3,7 +3,9 @@ package com.ruoyi.postCheck.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.Arith;
+import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.ruoyi.postCheck.domain.homePage.*;
+import com.ruoyi.postCheck.service.IPostAssessmentRatingService;
 import com.ruoyi.postCheck.service.IPostCheckedProblemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +16,16 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
+
+
+
+
+
+
+
+
+
 
 /**
  * 岗检问题表Controller
@@ -27,7 +39,8 @@ import java.util.*;
 public class PostCheckedHomePageController extends BaseController {
     @Autowired
     private IPostCheckedProblemService postCheckedProblemService;
-
+    @Autowired
+    private IPostAssessmentRatingService postAssessmentRatingService;
     /**
      * 1、责任制清单：post_list表
      * 2、检查出的问题：post_checked_problem表
@@ -58,61 +71,21 @@ public class PostCheckedHomePageController extends BaseController {
     @GetMapping("/checkedProblem")
     public AjaxResult checkedProblem() {
 //        检查出的问题：post_checked_problem表 按 problem_attribute-问题属性（1-完整问题；2-有效性问题；3-适宜性问题；） 分组 count(id)
-        List<PostCheckedProblemView> list = new ArrayList<>();
-        PostCheckedProblemView data = new PostCheckedProblemView();
-//        data.set
-//        data.set
-//        data.set
-        list.add(data);
-        return success(list);
+        return success(postCheckedProblemService.checkedProblem());
     }
 
 
     @ApiOperation("3-人员数量")
     @GetMapping("/userTotal")
     public AjaxResult userTotal() {
-//        查询人员表：sys_users
-        int userCount = 999;
-        return success(userCount);
+        return success(postCheckedProblemService.userTotal());
     }
 
 
     @ApiOperation("4-岗检问题整改率（中间饼状图 统计的 岗检问题整改率 和 岗检部门整改率 tab 切换时前端自己计算，不需要提供接口）")
     @GetMapping("/problemRectification")
     public AjaxResult problemRectification() {
-//        查询问题表：post_checked_problem
-//        group by problem_attribute 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
-//        最好给前端定义一个对象，用Map也可以
-        List<Map<Integer, BigDecimal>> dataList = new ArrayList<>();
-        Map<Integer, BigDecimal> data1 = new HashMap<>();
-        data1.put(0, new BigDecimal(Arith.round(new BigDecimal(0.9).doubleValue(), 2)));
-//        data1.put(1, new BigDecimal(0.95));//完整问题
-//        data1.put(2, new BigDecimal(0.88));//有效性问题
-//        data1.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data1);
-
-        Map<Integer, BigDecimal> data2 = new HashMap<>();
-//        data2.put(0, new BigDecimal(0.9));
-        data2.put(1, new BigDecimal(Arith.round(new BigDecimal(0.95).doubleValue(), 2)));//完整问题
-//        data2.put(2, new BigDecimal(0.88));//有效性问题
-//        data2.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data2);
-
-
-        Map<Integer, BigDecimal> data3 = new HashMap<>();
-//        data3.put(0, new BigDecimal(0.9));
-//        data3.put(1, new BigDecimal(0.95));//完整问题
-        data3.put(2, new BigDecimal(Arith.round(new BigDecimal(0.88).doubleValue(), 2)));//有效性问题
-//        data3.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data3);
-
-        Map<Integer, BigDecimal> data4 = new HashMap<>();
-//        data4.put(0, new BigDecimal(0.9));
-//        data4.put(1, new BigDecimal(0.95));//完整问题
-//        data4.put(2, new BigDecimal(0.88));//有效性问题
-        data4.put(3, new BigDecimal(Arith.round(new BigDecimal(0.86).doubleValue(), 2)));//适宜性问题
-        dataList.add(data4);
-        return success(dataList);
+        return success(postCheckedProblemService.problemRectification());
     }
 
 
@@ -122,25 +95,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        查询问题表：post_checked_problem
 //        group by checked_dept_id 整改责任部门ID（被检查部门ID）
 //        最好给前端定义一个对象，用Map也可以
-        List<DeptProblemRectificationView> dataList = new ArrayList<>();
-        DeptProblemRectificationView data1 = new DeptProblemRectificationView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setProblemTotal(10);
-        data1.setProblemComplete(9);
-        data1.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.9).doubleValue(), 2)));
-        dataList.add(data1);
-
-
-        DeptProblemRectificationView data2 = new DeptProblemRectificationView();
-        data2.setDeptId(101l);
-        data2.setDeptName("测试部门V2");
-        data2.setProblemTotal(8);
-        data2.setProblemComplete(4);
-        data2.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.5).doubleValue(), 2)));
-        dataList.add(data2);
-
-        return success(dataList);
+        return success(postCheckedProblemService.deptProblemRectification());
     }
 
 
@@ -163,15 +118,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        select * from "public"."sys_users";
 //        select * from "public"."sys_user_post";
 
-        List<PostCheckedUnCheckedView> dataList = new ArrayList<>();
-        PostCheckedUnCheckedView data1 = new PostCheckedUnCheckedView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setPostId(1l);
-        data1.setPostName("内操岗位");
-        data1.setUserCount(99);
-        dataList.add(data1);
-        return success(dataList);
+        return success(postCheckedProblemService.postChecked(1));
     }
 
 
@@ -194,15 +141,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        select * from "public"."sys_users";
 //        select * from "public"."sys_user_post";
 
-        List<PostCheckedUnCheckedView> dataList = new ArrayList<>();
-        PostCheckedUnCheckedView data1 = new PostCheckedUnCheckedView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setPostId(1l);
-        data1.setPostName("内操岗位");
-        data1.setUserCount(99);
-        dataList.add(data1);
-        return success(dataList);
+        return success(postCheckedProblemService.postChecked(2));
     }
 
 
@@ -218,18 +157,28 @@ public class PostCheckedHomePageController extends BaseController {
 
 //      部门得分 = （岗检分数 * 0.5 + 互评分数 * 0.5  ）
 //      根据部门得分进行排名计算
-
-
+        PostAssessmentRating postAssessmentRating1 = new PostAssessmentRating();
+        postAssessmentRating1.setType(1);
+        List<PostAssessmentRating> postAssessmentRatings1 = postAssessmentRatingService.selectPostAssessmentRatingList(postAssessmentRating1);
+        PostAssessmentRating postAssessmentRating2 = new PostAssessmentRating();
+        postAssessmentRating2.setType(2);
+        List<PostAssessmentRating> postAssessmentRatings2 = postAssessmentRatingService.selectPostAssessmentRatingList(postAssessmentRating2);
+        postAssessmentRatings1.addAll(postAssessmentRatings2);
         List<AssessmentRatingView> dataList = new ArrayList<>();
-        AssessmentRatingView data1 = new AssessmentRatingView();
-        data1.setRating(1);
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-//        data1.setPostId(1l);
-//        data1.setPostName("内操岗位");
-        data1.setPostCount(6);
-        data1.setScore(new BigDecimal(Arith.round(new BigDecimal(99.98).doubleValue(), 2)));
-        dataList.add(data1);
-        return success(dataList);
+        postAssessmentRatings1.forEach(x->{
+            AssessmentRatingView data1 = new AssessmentRatingView();
+            data1.setDeptId(x.getDeptId());
+            data1.setDeptName(x.getDeptIdStr());
+            data1.setPostCount(postCheckedProblemService.getPostCountByDeptId(x.getDeptId()));
+            data1.setScore(x.getDepartmentScore());
+            dataList.add(data1);
+        });
+        List<AssessmentRatingView> collect = dataList.stream().sorted(Comparator.comparing(AssessmentRatingView::getScore).reversed()).collect(Collectors.toList());
+        Integer i = 1;
+        for (AssessmentRatingView x : collect) {
+            x.setRating(i);
+            i++;
+        }
+        return success(collect);
     }
 }

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/mapper/PostAssessmentRatingOtherMapper.java

@@ -69,6 +69,6 @@ public interface PostAssessmentRatingOtherMapper extends BaseMapper<PostAssessme
 
     List<Long> getDeptIdList(Long id);
 
-    List<Map<String,String>> getDeptIdListByType(Integer type);
+    List<Map<String,Object>> getDeptIdListByType(Integer type);
 
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostListMapper.java

@@ -6,6 +6,7 @@ import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostList;
 import com.ruoyi.postCheck.domain.PostListInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -89,4 +90,10 @@ public interface PostListMapper extends BaseMapper<PostList> {
     public int deletePostListInfoByPostListId(Long id);
 
     List<PostCheckedItems> contentListByType(@Param("deptId")Long deptId, @Param("postId")Long postId, @Param("type")Integer type);
+
+    Integer userTotal();
+
+    List<PostCheckedUnCheckedView> postChecked(Integer status);
+
+    Integer getPostCountByDeptId(Long deptId);
 }

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

@@ -1,13 +1,18 @@
 package com.ruoyi.postCheck.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.postCheck.domain.homePage.DeptProblemRectificationView;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedProblemView;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
@@ -157,6 +162,18 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
 
     PostTotalView totalView();
 
+    PostCheckedProblemView checkedProblem();
+
+    Integer userTotal();
+
+    Map<Integer, BigDecimal> problemRectification();
+
+    List<DeptProblemRectificationView>  deptProblemRectification();
+
+    List<PostCheckedUnCheckedView> postChecked(Integer i);
+
+    Integer getPostCountByDeptId(Long deptId);
+
     /**
      * 按问题属性分组统计问题类别
      * @return

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

@@ -1,7 +1,9 @@
 package com.ruoyi.postCheck.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,11 +79,11 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
             type = 2;
         }
         List<PostAssessmentRating> postAssessmentRatings = new ArrayList<>();
-        List<Map<String, String>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(postAssessmentRating.getType());
+        List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(postAssessmentRating.getType());
         List<PostAssessmentRules> postAssessmentRules = postAssessmentRulesMapper.selectList(Wrappers.lambdaQuery());
-        for (Map<String, String> map : deptIdListByType) {
+        for (Map<String, Object> map : deptIdListByType) {
             PostAssessmentRating post = new PostAssessmentRating();
-            post.setDeptId(Long.parseLong(map.get("deptId")));
+            post.setDeptId(Long.parseLong(map.get("deptId").toString()));
             post.setDeptIdStr(String.valueOf(map.get("deptName")));
             // 计算一个部门的岗检得分
             // 1 先查询问题
@@ -98,14 +100,17 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
                     Optional<PostAssessmentRules> first = postAssessmentRules.stream().filter(d ->d.getType() == type && d.getDutyType().equals(postCheckedProblem.getDutyType())).findFirst();
                     if (first.isPresent()){
                         if (postCheckedProblem.getProblemLevel().equals("1")){
-                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelOne())));
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelOne()!=null?first.get().getProblemLevelOne():"0")));
                         }else{
-                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo())));
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo()!=null?first.get().getProblemLevelTwo():"0")));
                         }
                     }
                 }
+                BigDecimal divide = new BigDecimal("0");
+                if (postTotal != null){
+                    divide =  new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())),4, RoundingMode.HALF_UP);
+                }
                 // 计算系数 1-问题总数/需要查的问题数
-                BigDecimal divide = new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())));
                 if (divide.compareTo(new BigDecimal("1")) < 0 && divide.compareTo(new BigDecimal("0")) > 0 ){
                     postSouce = postAfter.multiply(new BigDecimal("1").subtract(divide));
                 }else{
@@ -119,7 +124,7 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
 
             List<PostAssessmentRatingOtherInfo> postAssessmentRatingOtherInfos = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
                     .eq(PostAssessmentRatingOtherInfo::getByDeptId,post.getDeptId())
-                    .apply("and \"rating_other_id\" in (SELECT \"id\" FROM \"public\".\"post_assessment_rating_other\" WHERE \"type\"  = 1\n)")
+                    .apply(" \"rating_other_id\" in (SELECT \"id\" FROM \"public\".\"post_assessment_rating_other\" WHERE \"type\"  = 1\n)")
                     .orderByAsc(PostAssessmentRatingOtherInfo::getByDeptScore)
             );
             BigDecimal peerEvaluationScore = new BigDecimal("100");
@@ -128,17 +133,18 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
                 postAssessmentRatingOtherInfos.remove(0);
                 BigDecimal sum = new BigDecimal("0");
                 postAssessmentRatingOtherInfos.forEach(x -> {
-                    sum.add(x.getByDeptScore());
+                    sum.add(x.getByDeptScore()!=null?x.getByDeptScore():new BigDecimal("0"));
                 });
-                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()));
+                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()),4, RoundingMode.HALF_UP);
             }
             post.setPeerEvaluationScore(peerEvaluationScore);
             postAssessmentRatings.add(post);
             // 计算总得分
             post.setDepartmentScore(post.getPositionScore().add(post.getPeerEvaluationScore()).divide(new BigDecimal("2")));
         }
+        List<PostAssessmentRating> collect = postAssessmentRatings.stream().sorted(Comparator.comparing(PostAssessmentRating::getDepartmentScore).reversed()).collect(Collectors.toList());
         // 计算  岗检得分
-        return postAssessmentRatings;
+        return collect;
     }
 
     /**

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

@@ -2,9 +2,14 @@ package com.ruoyi.postCheck.service.impl;
 
 import java.awt.dnd.DropTarget;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,6 +21,9 @@ import com.ruoyi.postCheck.domain.PostAssessmentRules;
 import com.ruoyi.postCheck.domain.PostList;
 import com.ruoyi.postCheck.domain.PostPlan;
 import com.ruoyi.postCheck.domain.PostPlanInfo;
+import com.ruoyi.postCheck.domain.homePage.DeptProblemRectificationView;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedProblemView;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
 import com.ruoyi.postCheck.domain.join.PostPlanJoinProblem;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
@@ -61,7 +69,6 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     private IPostPlanJoinProblemService postPlanJoinProblemService;
     @Autowired
     private PostListMapper postListMapper;
-
     /**
      * 查询岗检问题表
      *
@@ -499,6 +506,118 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         return postTotalView;
     }
 
+    @Override
+    public PostCheckedProblemView checkedProblem() {
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        Integer problemComplete = 0;
+        Integer problemSuitable = 0;
+        Integer problemEffective = 0;
+        //（1-完整问题；2-有效性问题；3-适宜性问题；）
+        if (!postCheckedProblems.isEmpty())
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 1)
+                    problemComplete++;
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 3)
+                    problemEffective++;
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 2)
+                    problemSuitable++;
+            }
+        PostCheckedProblemView post = new PostCheckedProblemView();
+        post.setProblemTotal(postCheckedProblems.size());
+        post.setProblemComplete(problemComplete);
+        post.setProblemSuitable(problemSuitable);
+        post.setProblemEffective(problemEffective);
+        return post;
+    }
+
+    @Override
+    public Integer userTotal() {
+        return postListMapper.userTotal();
+    }
+
+    @Override
+    public Map<Integer, BigDecimal> problemRectification() {
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        Integer problemComplete = 0;
+        Integer overproblemComplete = 0;
+        Integer problemSuitable = 0;
+        Integer overproblemSuitable = 0;
+        Integer problemEffective = 0;
+        Integer overproblemEffective = 0;
+        Integer total = 0;
+        Integer overtotal = 0;
+        //（1-完整问题；2-有效性问题；3-适宜性问题；4 总数）
+        if (!postCheckedProblems.isEmpty())
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 1) {
+                    problemComplete++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemComplete++;
+                    }
+                }
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 3) {
+                    problemEffective++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemEffective++;
+                    }
+                }
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 2) {
+                    problemSuitable++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemSuitable++;
+                    }
+                }
+                total++;
+                if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                    overtotal++;
+                }
+            }
+        Map<Integer, BigDecimal> map = new HashMap<>();
+        map.put(1, new BigDecimal(overproblemComplete).divide(new BigDecimal(problemComplete),4, RoundingMode.HALF_UP));
+        map.put(2, new BigDecimal(overproblemSuitable).divide(new BigDecimal(problemSuitable),4, RoundingMode.HALF_UP));
+        map.put(3, new BigDecimal(overproblemEffective).divide(new BigDecimal(problemEffective),4, RoundingMode.HALF_UP));
+        map.put(4, new BigDecimal(overtotal).divide(new BigDecimal(total),4, RoundingMode.HALF_UP));
+        return map;
+
+    }
+
+    @Override
+    public List<DeptProblemRectificationView> deptProblemRectification() {
+        List<DeptProblemRectificationView> dataList = new ArrayList<>();
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        if (!postCheckedProblems.isEmpty()){
+            Map<Long, List<PostCheckedProblem>> postMapListMap = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getCheckedDeptId));
+            for (Map.Entry<Long, List<PostCheckedProblem>> entry : postMapListMap.entrySet()) {
+                DeptProblemRectificationView data1 = new DeptProblemRectificationView();
+                data1.setDeptId(entry.getKey());
+                data1.setDeptName(postAssessmentRatingMapper.getSysDeptName(entry.getKey()));
+                Integer problemTotal = 0;
+                Integer problemComplete = 0;
+                for (PostCheckedProblem postCheckedProblem : entry.getValue()) {
+                    problemTotal++;
+                    if (postCheckedProblem.getIsRectificationCompleted()!=null&&postCheckedProblem.getIsRectificationCompleted() == 1){
+                        problemComplete++;
+                    }
+                }
+                data1.setProblemTotal(problemTotal);
+                data1.setProblemComplete(problemComplete);
+                data1.setProblemRectificationRate(new BigDecimal(problemComplete).divide(new BigDecimal(problemTotal),4, RoundingMode.HALF_UP));
+                dataList.add(data1);
+            }
+        }
+        return dataList;
+    }
+
+    @Override
+    public List<PostCheckedUnCheckedView> postChecked(Integer i) {
+        return postListMapper.postChecked(i);
+    }
+
+    @Override
+    public Integer getPostCountByDeptId(Long deptId) {
+        return postListMapper.getPostCountByDeptId(deptId);
+    }
+
     /**
      * 按问题属性分组统计问题类别
      *

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/PostAssessmentRatingOtherMapper.xml

@@ -178,6 +178,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getDeptIdListByType" resultType="java.util.Map">
-        SELECT "dept_id" as deptId,"dept_name" as deptName FROM "public"."sys_dept" where "type" = #{type};
+        SELECT "dept_id" as deptId,"dept_name" as deptName FROM "public"."sys_dept" where "type" = #{type} group by "dept_id","dept_name"
     </select>
 </mapper>

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

@@ -294,4 +294,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND t1."post_id" = #{postId}
         AND t2."type" = #{type}
     </select>
+
+    <select id="userTotal" resultType="java.lang.Integer">
+        SELECT count(0) FROM "public"."sys_users"
+    </select>
+
+    <select id="postChecked" resultType="com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView">
+        SELECT
+            t2."checked_dept_id" deptId ,
+            t2.checked_post_id postId,
+            (select a."post_name" from "public"."sys_post" a WHERE a."post_id" = t2.checked_post_id) AS postName,
+            (select aa."dept_name" from "public"."sys_dept" aa WHERE aa."dept_id" = t2.checked_dept_id) AS deptName,
+            (select count(0) from "public"."sys_user_post" a LEFT JOIN "public"."sys_users" b ON a."user_id" = b."user_id" WHERE a."post_id" = t2."checked_post_id") AS "userCount"
+        FROM "post_plan" t1
+                 INNER JOIN "post_plan_info" t2 ON t2."post_plan_id" = t1."id"
+        WHERE t1.status = 3 -- 状态：1-待审核；2-审核中；3-通过；4-驳回；
+          AND t2."status" = #{status} -- 岗检状态：1-未检；2-已检；
+        GROUP BY t2."checked_dept_id", t2."checked_post_id"
+        ORDER BY t2."checked_dept_id"
+    </select>
+
+    <select id="getPostCountByDeptId" resultType="java.lang.Integer">
+        SELECT COUNT(0) FROM "public"."sys_user_post" sup LEFT JOIN "public"."sys_user_role" sur ON sup."user_id" = sur."user_id"
+                                                          LEFT JOIN "public"."sys_role_dept" srd ON sur."role_id" = srd."role_id"
+        WHERE srd."dept_id" = #{deptId}
+    </select>
 </mapper>

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

@@ -32,6 +32,35 @@
     </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,
+            step
+        from post_programme
+        -->
         select
             t1.id,
             t1.name,
@@ -56,7 +85,8 @@
             t1.status_time,
             t1.status_user_id,
             t1.status_icfa_user_id,
-            t1.status_hr_user_id
+            t1.status_hr_user_id,
+            step
         from post_programme t1
     </sql>
 
@@ -115,6 +145,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>
@@ -141,6 +172,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>
 
@@ -170,6 +202,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}