修改考核分析报表

修改清单审核

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -33,7 +33,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 角色信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -59,7 +59,8 @@ public class SysRoleController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {
-        startPage();
+//        startPage();
+        startPage("desc", "r.create_time");
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
     }
@@ -125,7 +126,7 @@ public class SysRoleController extends BaseController
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(getUsername());
-        
+
         if (roleService.updateRole(role) > 0)
         {
             // 更新缓存用户权限

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -65,7 +65,8 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
-        startPage();
+//        startPage();
+        startPage("desc", "u.create_time");
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }

ruoyi-admin/src/test/java/com/post/Test01.java

@@ -9,8 +9,13 @@ public class Test01 {
         double round = Arith.round(new BigDecimal(99.98).doubleValue(), 2);
         System.out.println(round);
         System.out.println(new BigDecimal(round).doubleValue());
+
+        for (int i = 100; i < 201; i++) {
+            System.out.println("insert into post_tools (id, \"type\", \"type_view\") values(" + i + ", 1, " + (2020 + (i - 100)) + ");");
+        }
     }
-    public void ss(){
+
+    public void ss() {
 
     }
 }

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

@@ -189,7 +189,6 @@ public class PostAssessmentRatingController extends BaseController {
      * 根据部门查询问题
      */
     @ApiOperation("根据部门查询问题")
-
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "类型1 年度 2 季度 3 月度", dataType = "String", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "year", value = "年份", dataType = "String", dataTypeClass = String.class)
@@ -197,7 +196,8 @@ public class PostAssessmentRatingController extends BaseController {
     @GetMapping("/{type}/{year}")
     @Anonymous
     public AjaxResult assessmentstatistics(@PathVariable("type") Integer type,@PathVariable("year") String year) {
-        return success(postAssessmentRatingService.assessmentstatistics(type,year));
+//        return success(postAssessmentRatingService.assessmentstatistics(type,year));
+        return success(postAssessmentRatingService.assessmentstatisticsV2(type,year));
     }
 
 }

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

@@ -9,14 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 import org.apache.ibatis.annotations.MapKey;
-
-
-
-
-
-
-
-
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -25,8 +18,7 @@ import org.apache.ibatis.annotations.MapKey;
  * @author csg
  * @date 2023-12-23
  */
-public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem>
-{
+public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem> {
     /**
      * 查询岗检问题表
      *
@@ -81,13 +73,24 @@ public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem>
 
     /**
      * 按问题属性分组统计问题类别
+     *
      * @return
      */
     List<ProblemCategory> problemCategoryByAttribute();
+
     @MapKey("YEAR")
     Map<String, Object> getYearStatistics(String year);
+
     @MapKey("QUARTER")
     Map<String, Object> getQuarterStatistics(String year);
+
     @MapKey("MONTH")
     Map<String, Object> getMonthStatistics(String year);
+
+    // 改造返回值=List；改造自动填充值（没有数据的月份自动填充）
+    List<Map<String, Object>> getYearStatisticsV2(@Param("beginYear") Integer beginYear, @Param("endYear") Integer endYear);
+
+    List<Map<String, Object>> getQuarterStatisticsV2(String year);
+
+    List<Map<String, Object>> getMonthStatisticsV2(String year);
 }

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

@@ -75,4 +75,6 @@ public interface IPostAssessmentRatingService extends IService<PostAssessmentRat
     List<PostCheckedProblem> getProblemByDeptId(Long id);
 
     Map<String,Object> assessmentstatistics(Integer type, String year);
+
+    List<Map<String, Object>> assessmentstatisticsV2(Integer type, String year);
 }

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

@@ -24,6 +24,7 @@ import com.ruoyi.postCheck.mapper.PostAssessmentRulesMapper;
 import com.ruoyi.postCheck.mapper.PostCheckedProblemMapper;
 import com.ruoyi.postCheck.mapper.PostPlanInfoMapper;
 import com.ruoyi.postCheck.mapper.PostPlanMapper;
+import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
@@ -53,6 +54,7 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
     private PostPlanMapper postPlanMapper;
     @Autowired
     private PostAssessmentRulesMapper postAssessmentRulesMapper;
+
     /**
      * 查询考核评比
      *
@@ -74,7 +76,7 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
     public List<PostAssessmentRating> selectPostAssessmentRatingList(PostAssessmentRating postAssessmentRating) {
         // type 1 是职能管理部门， 2 生产运营部门
         Integer type;
-        if (postAssessmentRating.getType() == 2){
+        if (postAssessmentRating.getType() == 2) {
             type = 3;
         } else {
             type = 2;
@@ -90,53 +92,53 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
             // 1 先查询问题
             BigDecimal postSouce = new BigDecimal("100");
             List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
-                    .eq(PostCheckedProblem::getCheckedDeptId,post.getDeptId())
+                    .eq(PostCheckedProblem::getCheckedDeptId, post.getDeptId())
             );
             BigDecimal postTotal = postCheckedProblemMapper.getPostTotalByDeptId(post.getDeptId());
-            if (postCheckedProblems.size() > 0){
+            if (postCheckedProblems.size() > 0) {
                 // 计算扣除分数
                 BigDecimal postAfter = new BigDecimal("100");
                 Set<PostAssessmentRules> collect = postAssessmentRules.stream().filter(d -> d.getType() == type).collect(Collectors.toSet());
                 for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
-                    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()!=null?first.get().getProblemLevelOne():"0")));
-                        }else{
-                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo()!=null?first.get().getProblemLevelTwo():"0")));
+                    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() != null ? first.get().getProblemLevelOne() : "0")));
+                        } else {
+                            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);
+                if (postTotal != null) {
+                    divide = new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())), 4, RoundingMode.HALF_UP);
                 }
                 // 计算系数 1-问题总数/需要查的问题数
-                if (divide.compareTo(new BigDecimal("1")) < 0 && divide.compareTo(new BigDecimal("0")) > 0 ){
+                if (divide.compareTo(new BigDecimal("1")) < 0 && divide.compareTo(new BigDecimal("0")) > 0) {
                     postSouce = postAfter.multiply(new BigDecimal("1").subtract(divide));
-                }else{
+                } else {
                     postSouce = new BigDecimal("0");
                 }
-            }else {
+            } else {
                 postSouce = new BigDecimal("0");
             }
             post.setPositionScore(postSouce);
             // 计算互评得分
 
             List<PostAssessmentRatingOtherInfo> postAssessmentRatingOtherInfos = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
-                    .eq(PostAssessmentRatingOtherInfo::getByDeptId,post.getDeptId())
+                    .eq(PostAssessmentRatingOtherInfo::getByDeptId, post.getDeptId())
                     .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");
-            if (postAssessmentRatingOtherInfos.size()>0){
-                postAssessmentRatingOtherInfos.remove(postAssessmentRatingOtherInfos.size()-1);
+            if (postAssessmentRatingOtherInfos.size() > 0) {
+                postAssessmentRatingOtherInfos.remove(postAssessmentRatingOtherInfos.size() - 1);
                 postAssessmentRatingOtherInfos.remove(0);
                 BigDecimal sum = new BigDecimal("0");
                 postAssessmentRatingOtherInfos.forEach(x -> {
-                    sum.add(x.getByDeptScore()!=null?x.getByDeptScore():new BigDecimal("0"));
+                    sum.add(x.getByDeptScore() != null ? x.getByDeptScore() : new BigDecimal("0"));
                 });
-                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()),4, RoundingMode.HALF_UP);
+                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()), 4, RoundingMode.HALF_UP);
             }
             post.setPeerEvaluationScore(peerEvaluationScore);
             postAssessmentRatings.add(post);
@@ -201,18 +203,45 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
     @Override
     public List<PostCheckedProblem> getProblemByDeptId(Long id) {
         return postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
-            .eq(PostCheckedProblem::getCheckedDeptId,id)
+                .eq(PostCheckedProblem::getCheckedDeptId, id)
         );
     }
 
+
     @Override
     public Map<String, Object> assessmentstatistics(Integer type, String year) {
         if (type == 1)
             return postCheckedProblemMapper.getYearStatistics(year);
         if (type == 2)
-            return postCheckedProblemMapper.getQuarterStatistics(year);;
+            return postCheckedProblemMapper.getQuarterStatistics(year);
         if (type == 3)
-            return postCheckedProblemMapper.getMonthStatistics(year);;
+            return postCheckedProblemMapper.getMonthStatistics(year);
         return new HashMap<>();
     }
+
+    //    @ApiImplicitParam(name = "type", value = "类型1 年度 2 季度 3 月度", dataType = "String", dataTypeClass = Integer.class),
+//    @ApiImplicitParam(name = "year", value = "年份", dataType = "String", dataTypeClass = String.class)
+    @Override
+    public List<Map<String, Object>> assessmentstatisticsV2(Integer type, String year) {
+        if (type == 1) {
+            int endYear = Integer.parseInt(year);
+            int beginYear = endYear - 3;
+            return postCheckedProblemMapper.getYearStatisticsV2(beginYear, endYear);
+        } else if (type == 2) {
+            return postCheckedProblemMapper.getQuarterStatisticsV2(year);
+        } else if (type == 3) {
+            List<Map<String, Object>> monthStatisticsV2 = postCheckedProblemMapper.getMonthStatisticsV2(year);
+            return monthStatisticsV2;
+        }
+
+        /*
+
+
+        month
+        year
+        year
+         */
+
+        return new ArrayList<>();
+    }
 }

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

@@ -120,17 +120,17 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
 
         //TODO 更新业务职责的状态=待审核：只要部门修改数据，人力资源都需要重新审核单据
         //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
-        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<PostListInfo> infoLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         //条件
-        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
-        lambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
+        infoLambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
+        infoLambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
         //参数
-        lambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
-        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
-        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
-        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
-        lambdaUpdateWrapper.set(PostListInfo::getReason, null);
-        postListInfoMapper.update(null, lambdaUpdateWrapper);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getReason, null);
+        postListInfoMapper.update(null, infoLambdaUpdateWrapper);
 
         return rows;
     }
@@ -168,17 +168,17 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
 
         //TODO 更新业务职责的状态=待审核：只要部门修改数据，人力资源都需要重新审核单据
         //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
-        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<PostListInfo> infoLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         //条件
-        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
-        lambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
+        infoLambdaUpdateWrapper.eq(PostListInfo::getPostListId, postList.getId());
+        infoLambdaUpdateWrapper.eq(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());
         //参数
-        lambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
-        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
-        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
-        lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
-        lambdaUpdateWrapper.set(PostListInfo::getReason, null);
-        postListInfoMapper.update(null, lambdaUpdateWrapper);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusTime, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+        infoLambdaUpdateWrapper.set(PostListInfo::getReason, null);
+        postListInfoMapper.update(null, infoLambdaUpdateWrapper);
 
         return updateCount;
     }
@@ -347,31 +347,44 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
                 }
                 throw new BaseException("以下部门还未审核，请检查！" + typeView);
             }
+
+            LambdaUpdateWrapper<PostList> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.eq(PostList::getId, id);
+            lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_PASS.getValue());
+            postListMapper.update(null, lambdaUpdateWrapper);
+        }
+        //非人力资源审核，将外层状态设置为审核中
+        else {
+            LambdaUpdateWrapper<PostList> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.eq(PostList::getId, id);
+            lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_WAIT.getValue());
+            postListMapper.update(null, lambdaUpdateWrapper);
+
         }
 
 
         //1、按区域类型+主表id批量更新明细表状态、审核人、审核时间、未通过理由
-        LambdaUpdateWrapper<PostListInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<PostListInfo> infoLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         //条件
-        lambdaUpdateWrapper.eq(PostListInfo::getPostListId, id);
-        lambdaUpdateWrapper.eq(PostListInfo::getType, type);
+        infoLambdaUpdateWrapper.eq(PostListInfo::getPostListId, id);
+        infoLambdaUpdateWrapper.eq(PostListInfo::getType, type);
         //参数
-        lambdaUpdateWrapper.set(PostListInfo::getStatus, status);
-        lambdaUpdateWrapper.set(PostListInfo::getStatusTime, new Date());
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatus, status);
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusTime, new Date());
 
         //通过-参数
         if (status == PostListEnum.STATUS_PASS.getValue()) {
-            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
-            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
-            lambdaUpdateWrapper.set(PostListInfo::getReason, null);
+            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
+            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
+            infoLambdaUpdateWrapper.set(PostListInfo::getReason, null);
         }
         //驳回-参数
         else if (status == PostListEnum.STATUS_BACK.getValue()) {
-            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
-            lambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
-            lambdaUpdateWrapper.set(PostListInfo::getReason, reason);
+            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+            infoLambdaUpdateWrapper.set(PostListInfo::getReason, reason);
         }
-        int updateCount = postListInfoMapper.update(null, lambdaUpdateWrapper);
+        int updateCount = postListInfoMapper.update(null, infoLambdaUpdateWrapper);
         if (updateCount == 0) {
             throw new BaseException("更新状态失败，请稍后重试！");
         }

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

@@ -408,6 +408,7 @@
         GROUP BY a."QUARTER"
     </select>
 
+
     <select id="getYearStatistics" resultType="java.util.Map">
         SELECT "YEAR",IFNULL(sum(num), '0') "num"
         FROM (SELECT t."YEAR", (t."sum" - t."two" - t."one") / "total" AS "num"
@@ -501,4 +502,174 @@
                            )) a
         GROUP BY a."MONTH"
     </select>
+
+    <select id="getYearStatisticsV2" resultType="java.util.Map">
+        SELECT
+            tools."type_view" AS "YEAR",
+            ROUND(IFNULL(t1."num", 0), 2)  AS "num"
+        FROM post_tools tools
+        LEFT JOIN (
+            SELECT "YEAR",IFNULL(sum(num), '0') "num"
+            FROM (SELECT t."YEAR", (t."sum" - t."two" - t."one") / "total" AS "num"
+                  FROM (SELECT EXTRACT(
+                                       YEAR
+                                       FROM
+                                       pp."create_time"
+                                   )       "YEAR",
+                               sum(pr."full_score"),
+                               COUNT(0)    total,
+                               SUM(CASE
+                                   pp."problem_level"
+                                       WHEN 2 THEN pr."problem_level_two"
+                                       ELSE '0'
+                                   END) AS "two",
+                               sum(CASE
+                                   pp."problem_level"
+                                       WHEN 1 THEN pr."problem_level_one"
+                                       ELSE '0'
+                                   END) AS "one"
+                        FROM "public"."post_checked_problem" pp
+                                 INNER JOIN "public"."post_assessment_rules" pr ON
+                                    pp."duty_type" = pr."duty_type"
+                                AND pr."type" = 1
+                        GROUP BY EXTRACT(
+                                         YEAR
+                                         FROM
+                                         pp."create_time"
+                                     )) t
+                  union all
+                  SELECT EXTRACT(
+                                 YEAR
+                                 FROM
+                                 "create_time"
+                             ) AS                        "YEAR",
+                         sum("by_dept_score") / count(0) "num"
+
+                  FROM "public"."post_assessment_rating_other_info"
+                  GROUP BY EXTRACT(
+                                   YEAR
+                                   FROM
+                                   "create_time"
+                               )) a
+            GROUP BY a."YEAR"
+        )t1 ON t1."YEAR"  = tools."type_view"
+        WHERE tools."type" = 1
+        AND tools."type_view" >= #{beginYear}
+        AND tools."type_view" <![CDATA[<= ]]> #{endYear}
+        ORDER BY tools."type_view" DESC
+    </select>
+
+    <select id="getQuarterStatisticsV2" resultType="java.util.Map">
+        SELECT
+            tools."type_view" AS "QUARTER",
+            IFNULL (ROUND(t1."num", 0) , 0) AS "num"
+        FROM post_tools tools
+        LEFT JOIN (
+            SELECT "QUARTER",IFNULL(sum(num), '0') "num"
+            FROM (SELECT t."QUARTER", (t."sum" - t."two" - t."one") / "total" AS "num"
+                  FROM (SELECT EXTRACT(
+                                       QUARTER
+                                       FROM
+                                       pp."create_time"
+                                   )       "QUARTER",
+                               sum(pr."full_score"),
+                               COUNT(0)    total,
+                               SUM(CASE
+                                   pp."problem_level"
+                                       WHEN 2 THEN pr."problem_level_two"
+                                       ELSE '0'
+                                   END) AS "two",
+                               sum(CASE
+                                   pp."problem_level"
+                                       WHEN 1 THEN pr."problem_level_one"
+                                       ELSE '0'
+                                   END) AS "one"
+                        FROM "public"."post_checked_problem" pp
+                                 INNER JOIN "public"."post_assessment_rules" pr ON
+                                    pp."duty_type" = pr."duty_type"
+                                AND pr."type" = 1
+                        WHERE to_date(pp."create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                        GROUP BY EXTRACT(
+                                         QUARTER
+                                         FROM
+                                         pp."create_time"
+                                     )) t
+                  union all
+                  SELECT EXTRACT(
+                                 QUARTER
+                                 FROM
+                                 "create_time"
+                             ) AS                        "QUARTER",
+                         sum("by_dept_score") / count(0) "num"
+
+                  FROM "public"."post_assessment_rating_other_info"
+                  WHERE to_date("create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                  GROUP BY EXTRACT(
+                                   QUARTER
+                                   FROM
+                                   "create_time"
+                               )) a
+            GROUP BY a."QUARTER"
+        ) t1 ON t1."QUARTER" = tools."type_view"
+        WHERE tools."type" = 2
+        ORDER BY tools."type_view"
+    </select>
+
+    <select id="getMonthStatisticsV2" resultType="java.util.Map">
+        SELECT
+            tools."type_view" AS "MONTH",
+            IFNULL (round(t1."num", 2),0) AS "num"
+        FROM post_tools tools
+        LEFT JOIN (
+            SELECT
+                "MONTH",
+                IFNULL(sum(num), '0') "num"
+            FROM (SELECT t."MONTH", (t."sum" - t."two" - t."one") / "total" AS "num"
+                  FROM (SELECT EXTRACT(
+                                       MONTH
+                                       FROM
+                                       pp."create_time"
+                                   )       "MONTH",
+                               sum(pr."full_score"),
+                               COUNT(0)    total,
+                               SUM(CASE
+                                   pp."problem_level"
+                                       WHEN 2 THEN pr."problem_level_two"
+                                       ELSE '0'
+                                   END) AS "two",
+                               sum(CASE
+                                   pp."problem_level"
+                                       WHEN 1 THEN pr."problem_level_one"
+                                       ELSE '0'
+                                   END) AS "one"
+                        FROM "public"."post_checked_problem" pp
+                                 INNER JOIN "public"."post_assessment_rules" pr ON
+                                    pp."duty_type" = pr."duty_type"
+                                AND pr."type" = 1
+                        WHERE to_date(pp."create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                        GROUP BY EXTRACT(
+                                         MONTH
+                                         FROM
+                                         pp."create_time"
+                                     )) t
+                  union all
+                  SELECT EXTRACT(
+                                 MONTH
+                                 FROM
+                                 "create_time"
+                             ) AS                        "MONTH",
+                         sum("by_dept_score") / count(0) "num"
+
+                  FROM "public"."post_assessment_rating_other_info"
+                  WHERE to_date("create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                  GROUP BY EXTRACT(
+                                   MONTH
+                                   FROM
+                                   "create_time"
+                               )) a
+            GROUP BY a."MONTH"
+        )t1 ON t1."MONTH" = tools."type_view"
+        WHERE tools."type" = 3
+        ORDER BY tools."type_view"
+    </select>
 </mapper>

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.exception.base.BaseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -194,6 +195,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public int insertDept(SysDept dept) {
+
+        String deptCode = dept.getDeptCode();
+        if (StringUtils.isBlank(deptCode)) {
+            throw new BaseException("请填写部门编码！");
+        }
+
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
         if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
@@ -201,6 +208,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         dept.setDeptId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+
         return deptMapper.insertDept(dept);
     }
 
@@ -212,6 +220,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public int updateDept(SysDept dept) {
+
+        String deptCode = dept.getDeptCode();
+        if (StringUtils.isBlank(deptCode)) {
+            throw new BaseException("请填写部门编码！");
+        }
+
         SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
         SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
         if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -6,9 +6,11 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.common.constant.PostLevelEnum;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.UserPostAuthority;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.UserConstants;
@@ -29,10 +31,13 @@ import org.springframework.util.CollectionUtils;
 public class SysPostServiceImpl implements ISysPostService {
     @Autowired
     private SysPostMapper postMapper;
-
     @Autowired
     private SysUserPostMapper userPostMapper;
 
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+
     /**
      * 查询岗位信息集合
      *
@@ -155,6 +160,29 @@ public class SysPostServiceImpl implements ISysPostService {
      */
     @Override
     public int insertPost(SysPost post) {
+
+        Long deptId = post.getDeptId();
+        Integer postLevel = post.getPostLevel();
+        String postCode = post.getPostCode();
+        if (deptId == null || postLevel == null || StringUtils.isBlank(postCode)) {
+            throw new BaseException("部门ID、岗位编码、岗位级别等必选参数为空，请检查！");
+        }
+
+        if (postLevel != PostLevelEnum.DEFAULT.getValue() && postLevel != PostLevelEnum.SET_MANAGER.getValue()) {
+            throw new BaseException("无效的岗位级别，请检查！");
+        }
+
+        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+        if (sysDept == null) {
+            throw new BaseException("无效的部门ID，请检查！");
+        } else {
+            String status = sysDept.getStatus();//部门状态（0正常 1停用）
+            if (status == null || "1".equals(status)) {
+                throw new BaseException("部门状态异常，请检查！");
+            }
+        }
+
+
         post.setPostId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         return postMapper.insertPost(post);
     }
@@ -167,6 +195,28 @@ public class SysPostServiceImpl implements ISysPostService {
      */
     @Override
     public int updatePost(SysPost post) {
+
+        Long deptId = post.getDeptId();
+        Integer postLevel = post.getPostLevel();
+        String postCode = post.getPostCode();
+        if (deptId == null || postLevel == null || StringUtils.isBlank(postCode)) {
+            throw new BaseException("部门ID、岗位编码、岗位级别等必选参数为空，请检查！");
+        }
+
+        if (postLevel != PostLevelEnum.DEFAULT.getValue() && postLevel != PostLevelEnum.SET_MANAGER.getValue()) {
+            throw new BaseException("无效的岗位级别，请检查！");
+        }
+
+        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+        if (sysDept == null) {
+            throw new BaseException("无效的部门ID，请检查！");
+        } else {
+            String status = sysDept.getStatus();//部门状态（0正常 1停用）
+            if (status == null || "1".equals(status)) {
+                throw new BaseException("部门状态异常，请检查！");
+            }
+        }
+
         return postMapper.updatePost(post);
     }
 
@@ -180,7 +230,6 @@ public class SysPostServiceImpl implements ISysPostService {
      */
     @Override
     public List<UserPostAuthority> userPostAuthorityList(Long deptId, Integer postLevel) {
-
         return postMapper.userPostAuthorityList(deptId, postLevel);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.validation.Validator;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.exception.base.BaseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -234,7 +235,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertUser(SysUser user) {
         user.setUserId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         // 新增用户信息
@@ -365,6 +366,9 @@ public class SysUserServiceImpl implements ISysUserService {
     public void insertUserPost(SysUser user) {
         Long[] posts = user.getPostIds();
         if (StringUtils.isNotEmpty(posts)) {
+            if (posts.length > 1) {
+                throw new BaseException("每人只能拥有一个岗位！");
+            }
             // 新增用户与岗位管理
             List<SysUserPost> list = new ArrayList<>(posts.length);
             for (Long postId : posts) {