问题统计

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

@@ -3,6 +3,9 @@ package com.ruoyi.postCheck.controller;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +87,9 @@ public class PostCheckedProblemController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblem:list')")
     @GetMapping("/list")
     public TableDataInfo list(PostCheckedProblem postCheckedProblem) {
-        startPage();
+
+//        startPage();
+        startPage("desc","t1.create_time");
         List<PostCheckedProblem> list = postCheckedProblemService.selectPostCheckedProblemList(postCheckedProblem);
         return getDataTable(list);
     }
@@ -361,4 +366,18 @@ public class PostCheckedProblemController extends BaseController {
         return toAjax(postCheckedProblemService.setReviewDepartmentReviewerTime(id, status, reviewConclusion, reason));
     }
 
+
+
+    @ApiOperation("Tools-1、按问题属性分组统计问题类别")
+    @GetMapping("/problemCategoryByAttribute")
+    public AjaxResult problemCategoryByAttribute(ProblemCategory noParam) {
+
+// GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+// GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+        List<ProblemCategory> problemCategoryByAttributeList = postCheckedProblemService.problemCategoryByAttribute();
+
+        return success(problemCategoryByAttributeList);
+    }
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/tools/ProblemCategory.java

@@ -0,0 +1,66 @@
+package com.ruoyi.postCheck.domain.tools;
+
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "按问题属性分组统计问题类别")
+@Data
+public class ProblemCategory extends ProblemNumberBase {
+
+    @ApiModelProperty("问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）")
+    private Integer problemAttribute;
+    @ApiModelProperty("问题属性显示名称")
+    private String problemAttributeView;
+
+//        @ApiModelProperty("职责权限问题")
+//        private Integer problemCategoryOne;
+
+//        @ApiModelProperty("工作内容问题")
+//        private Integer problemCategoryTwo;
+
+//        @ApiModelProperty("工作标准问题")
+//        private Integer problemCategoryThree;
+
+//        @ApiModelProperty("考核奖励问题")
+//        private Integer problemCategoryFour;
+
+//        @ApiModelProperty("任职资格问题")
+//        private Integer problemCategoryFive;
+
+//        @ApiModelProperty("其他")
+//        private Integer problemCategorySix;
+
+//        @ApiModelProperty("总数量")
+//        private Integer problemTotal;
+
+    public void setProblemAttribute(Integer problemAttribute) {
+        this.problemAttribute = problemAttribute;
+
+        if (problemAttribute != null)
+            switch (problemAttribute) {
+                case 1: {
+                    setProblemAttributeView("完整问题");
+
+                    break;
+                }
+                case 2: {
+                    setProblemAttributeView("有效性问题");
+
+                    break;
+                }
+                case 3: {
+                    setProblemAttributeView("适宜性问题");
+
+                    break;
+                }
+
+                default:
+                    setProblemAttributeView("Other");
+                    break;
+            }
+    }
+
+
+}

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

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 
 /**
  * 岗检问题表Mapper接口
@@ -64,4 +66,10 @@ public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem>
     BigDecimal getPostTotalByDeptId(Long deptId);
 
     Integer selectCheckedPostCount(int status);
+
+    /**
+     * 按问题属性分组统计问题类别
+     * @return
+     */
+    List<ProblemCategory> problemCategoryByAttribute();
 }

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

@@ -9,6 +9,8 @@ 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.PostTotalView;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -154,4 +156,10 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
 
 
     PostTotalView totalView();
+
+    /**
+     * 按问题属性分组统计问题类别
+     * @return
+     */
+    List<ProblemCategory> problemCategoryByAttribute();
 }

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

@@ -18,12 +18,15 @@ import com.ruoyi.postCheck.domain.PostPlan;
 import com.ruoyi.postCheck.domain.PostPlanInfo;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
 import com.ruoyi.postCheck.domain.join.PostPlanJoinProblem;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
 import com.ruoyi.postCheck.mapper.PostAssessmentRulesMapper;
 import com.ruoyi.postCheck.mapper.PostListMapper;
 import com.ruoyi.postCheck.mapper.PostPlanInfoMapper;
 import com.ruoyi.postCheck.mapper.PostPlanMapper;
 import com.ruoyi.postCheck.service.IPostPlanJoinProblemService;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,14 +39,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 
-
-
-
-
-
-
-
-
 /**
  * 岗检问题表Service业务层处理
  *
@@ -66,6 +61,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     private IPostPlanJoinProblemService postPlanJoinProblemService;
     @Autowired
     private PostListMapper postListMapper;
+
     /**
      * 查询岗检问题表
      *
@@ -157,7 +153,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         PostPlanInfo postPlanInfo = postPlanInfoMapper.selectById(planInfoId);
         PostPlan postPlan = postPlanMapper.selectById(postPlanInfo.getPostPlanId());
         List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
-                        .eq(PostCheckedProblem::getCheckedDeptId,departmentId)
+                .eq(PostCheckedProblem::getCheckedDeptId, departmentId)
                 .between(PostCheckedProblem::getCreateTime, postPlan.getStartTime(), postPlan.getEndTime())
 
         );
@@ -173,37 +169,37 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
             Optional<PostAssessmentRules> first = postAssessmentRules.stream().filter(d -> d.getDutyType().equals(postCheckedProblem.getDutyType())).findFirst();
             if (first.isPresent() && score.compareTo(new BigDecimal("0")) > 0) {
                 // 计算岗检得分
-                if (postCheckedProblem.getProblemLevel().equals("1")){
+                if (postCheckedProblem.getProblemLevel().equals("1")) {
                     score = score.subtract(first.get().getProblemLevelOne());
-                }else if(postCheckedProblem.getProblemLevel().equals("2")){
+                } else if (postCheckedProblem.getProblemLevel().equals("2")) {
                     score = score.subtract(first.get().getProblemLevelTwo());
                 }
             }
         }
 
         // todo 公式计算
-        if (postCheckedProblems.size()>0){
+        if (postCheckedProblems.size() > 0) {
             BigDecimal bigDecimal = new BigDecimal("1");
             List<PostPlanInfo> postPlanInfos = postPlanInfoMapper.selectList(Wrappers.<PostPlanInfo>lambdaQuery()
-                    .eq(PostPlanInfo::getPostPlanId,postPlan.getId())
+                    .eq(PostPlanInfo::getPostPlanId, postPlan.getId())
             );
-            if (postPlanInfos.size() <= 0){
+            if (postPlanInfos.size() <= 0) {
                 score = new BigDecimal("0");
-            }else{
+            } else {
                 BigDecimal divide = new BigDecimal(postCheckedProblems.size()).divide(new BigDecimal(postPlanInfos.size()).multiply(new BigDecimal("6")));
-                if (divide.compareTo(new BigDecimal("0"))<=0 || divide.compareTo(new BigDecimal("1")) > 0){
+                if (divide.compareTo(new BigDecimal("0")) <= 0 || divide.compareTo(new BigDecimal("1")) > 0) {
                     score = new BigDecimal("0");
-                }else{
+                } else {
                     score = bigDecimal.subtract(divide);
                 }
             }
-        }else{
+        } else {
             score = new BigDecimal("0");
         }
-        postAssessmentRatingMapper.update(null,Wrappers.<PostAssessmentRating>lambdaUpdate()
-                .set(PostAssessmentRating::getPositionScore,score)
-                .eq(PostAssessmentRating::getDeptId,departmentId)
-                .eq(PostAssessmentRating::getPlanId,postPlan.getId())
+        postAssessmentRatingMapper.update(null, Wrappers.<PostAssessmentRating>lambdaUpdate()
+                .set(PostAssessmentRating::getPositionScore, score)
+                .eq(PostAssessmentRating::getDeptId, departmentId)
+                .eq(PostAssessmentRating::getPlanId, postPlan.getId())
         );
     }
 
@@ -502,5 +498,78 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         postTotalView.setUncheckedPostCount(uncheckedPostCount);
         return postTotalView;
     }
+
+    /**
+     * 按问题属性分组统计问题类别
+     *
+     * @return
+     */
+    @Override
+    public List<ProblemCategory> problemCategoryByAttribute() {
+//        @ApiModelProperty("职责权限问题")
+//        private Integer problemCategoryOne;
+//        @ApiModelProperty("工作内容问题")
+//        private Integer problemCategoryTwo;
+//        @ApiModelProperty("工作标准问题")
+//        private Integer problemCategoryThree;
+//        @ApiModelProperty("考核奖励问题")
+//        private Integer problemCategoryFour;
+//        @ApiModelProperty("任职资格问题")
+//        private Integer problemCategoryFive;
+//        @ApiModelProperty("其他")
+//        private Integer problemCategorySix;
+//        @ApiModelProperty("总数量")
+//        private Integer problemTotal;
+
+        List<ProblemCategory> list = postCheckedProblemMapper.problemCategoryByAttribute();
+        ProblemCategory totalData = new ProblemCategory();
+        totalData.setProblemAttribute(999);
+        totalData.setProblemAttributeView("总计");
+        int problemCategoryOne = 0;
+        int problemCategoryTwo = 0;
+        int problemCategoryThree = 0;
+        int problemCategoryFour = 0;
+        int problemCategoryFive = 0;
+        int problemCategorySix = 0;
+        for (ProblemCategory data : list) {
+//            Integer problemAttribute = data.getProblemAttribute();
+//            switch (problemAttribute) {
+//                case 1: {
+//                    setProblemAttributeView("完整问题");
+//
+//                    break;
+//                }
+//                case 2: {
+//                    setProblemAttributeView("有效性问题");
+//
+//                    break;
+//                }
+//                case 3: {
+//                    setProblemAttributeView("适宜性问题");
+//
+//                    break;
+//                }
+//
+//                default:
+//                    setProblemAttributeView("Other");
+//                    break;
+//            }
+
+            problemCategoryOne += data.getProblemCategoryOne();
+            problemCategoryTwo += data.getProblemCategoryTwo();
+            problemCategoryThree += data.getProblemCategoryThree();
+            problemCategoryFour += data.getProblemCategoryFour();
+            problemCategoryFive += data.getProblemCategoryFive();
+            problemCategorySix += data.getProblemCategorySix();
+        }
+        totalData.setProblemCategoryOne(problemCategoryOne);
+        totalData.setProblemCategoryTwo(problemCategoryTwo);
+        totalData.setProblemCategoryThree(problemCategoryThree);
+        totalData.setProblemCategoryFour(problemCategoryFour);
+        totalData.setProblemCategoryFive(problemCategoryFive);
+        totalData.setProblemCategorySix(problemCategorySix);
+        list.add(totalData);
+        return list;
+    }
 }
 

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

@@ -92,10 +92,12 @@
             t1.duty_type,
 
             t2."dept_name" as checkedDeptName,
-            t3."post_name" as checkedPostName
+            t3."post_name" as checkedPostName,
+            t4."nick_name" AS rectificationResponsibleUserName
         from post_checked_problem t1
         LEFT JOIN "sys_dept" t2 ON t2."dept_id" = t1."checked_dept_id"
         LEFT JOIN "sys_post" t3 ON t3."post_id" = t1."checked_post_id"
+        LEFT JOIN "public"."sys_users" t4 ON  t4."user_id" = t1."rectification_responsible_user_id"
     </sql>
 
     <select id="selectPostCheckedProblemList" parameterType="PostCheckedProblem" resultMap="PostCheckedProblemResult">
@@ -305,4 +307,56 @@
         FROM "public"."post_plan" a INNER JOIN "public"."post_plan_info" ppi ON a."id"  = ppi."post_plan_id" WHERE ppi."status" = #{status}
 
     </select>
+
+    <!--按问题属性分组统计问题类别-->
+    <select id="problemCategoryByAttribute" resultType="ProblemCategory">
+        SELECT
+            problem_attribute,
+            COUNT(t1.id) AS problemTotal,
+            SUM(
+                 case
+                    when t1.problem_category = 1 then 1
+                    else 0
+                 END
+            ) AS problemCategoryOne,
+
+            SUM(
+                 case
+                    when t1.problem_category = 2 then 1
+                    else 0
+                 END
+            ) AS problemCategoryTwo,
+
+            SUM(
+                 case
+                    when t1.problem_category = 3 then 1
+                    else 0
+                 END
+            ) AS problemCategoryThree,
+
+
+            SUM(
+                 case
+                    when t1.problem_category = 4 then 1
+                    else 0
+                 END
+            ) AS problemCategoryFour,
+
+            SUM(
+                 case
+                    when t1.problem_category = 5 then 1
+                    else 0
+                 END
+            ) AS problemCategoryFive,
+
+            SUM(
+                 case
+                    when t1.problem_category = 6 then 1
+                    else 0
+                 END
+            ) AS problemCategorySix
+        FROM post_checked_problem t1
+        GROUP BY problem_attribute
+        ORDER BY t1.problem_attribute
+    </select>
 </mapper>