统计

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

@@ -198,22 +198,8 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
 
 
-        List<HistoryProblemNumberView> list = new ArrayList<>();
-        HistoryProblemNumberView data = new HistoryProblemNumberView();
-        data.setCheckYear(new Date());
-//        data.set问题总数
-//        data.set完成性
-//        data.set适宜性
-//        data.set有效性
-//        data.set职责权限
-//        data.set工作内容
-//        data.set工作标准
-//        data.set考核奖励
-//        data.set任职资格
-//        data.set其他
-
-        list.add(data);
-        return success(list);
+        Integer type = 1;
+        return success(postCheckedProblemService.historyProblemNumberView(type));
     }
 
 /*

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

@@ -14,6 +14,7 @@ import com.ruoyi.postCheck.domain.homePage.PostTotalView;
 import com.ruoyi.postCheck.domain.problemStatistics.CoverageRateView;
 import com.ruoyi.postCheck.domain.problemStatistics.DutyTypeProblemStatisticsView;
 import com.ruoyi.postCheck.domain.problemStatistics.FunctionDeptProblemContrastView;
+import com.ruoyi.postCheck.domain.problemStatistics.HistoryProblemNumberView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemAttributeCategoryView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemLevelView;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
@@ -197,4 +198,6 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
     List<ProblemLevelView>  problemLevelView(Integer type);
 
     List<ProblemAttributeCategoryView> problemAttributeCategoryView(Integer type);
+
+    List<HistoryProblemNumberView>  historyProblemNumberView(Integer type);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.postCheck.service.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -28,6 +29,7 @@ import com.ruoyi.postCheck.domain.join.PostPlanJoinProblem;
 import com.ruoyi.postCheck.domain.problemStatistics.CoverageRateView;
 import com.ruoyi.postCheck.domain.problemStatistics.DutyTypeProblemStatisticsView;
 import com.ruoyi.postCheck.domain.problemStatistics.FunctionDeptProblemContrastView;
+import com.ruoyi.postCheck.domain.problemStatistics.HistoryProblemNumberView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemAttributeCategoryView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemLevelView;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
@@ -49,6 +51,7 @@ import com.ruoyi.postCheck.service.IPostCheckedProblemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.FacesWebRequest;
 
 
 
@@ -894,10 +897,66 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
                 .in(PostCheckedProblem::getCheckedDeptId, deptIds)
         );
+        List<ProblemAttributeCategoryView> list = new ArrayList<>();
+        if(postCheckedProblems!=null && postCheckedProblems.size() >0){
+            Map<String, List<PostCheckedProblem>> collect = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getProblemCategory));
+//           问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+            for (Map.Entry<String, List<PostCheckedProblem>> stringListEntry : collect.entrySet()) {
+                List<PostCheckedProblem> value = stringListEntry.getValue();
+                if (value!=null&&value.size()>0){
+
+                    ProblemAttributeCategoryView data = new ProblemAttributeCategoryView();
+                    if(stringListEntry.getKey().equals("1")){
+                        data.setProblemCategoryType(1);
+                        data.setProblemCategoryTypeView("职责权限问题");
+                    }
+                    if(stringListEntry.getKey().equals("2")){
+                        data.setProblemCategoryType(2);
+                        data.setProblemCategoryTypeView("工作内容问题");
+                    }
+                    if(stringListEntry.getKey().equals("3")){
+                        data.setProblemCategoryType(3);
+                        data.setProblemCategoryTypeView("工作标准问题");
+                    }
+                    if(stringListEntry.getKey().equals("4")){
+                        data.setProblemCategoryType(4);
+                        data.setProblemCategoryTypeView("考核奖励问题");
+                    }
+                    if(stringListEntry.getKey().equals("5")){
+                        data.setProblemCategoryType(5);
+                        data.setProblemCategoryTypeView("任职资格问题");
+                    }
+                    if(stringListEntry.getKey().equals("6")){
+                        data.setProblemCategoryType(6);
+                        data.setProblemCategoryTypeView("其他");
+                    }
+//        @ApiModelProperty("完整性数量")
+                    int problemComplete = 0;
+//        @ApiModelProperty("适宜性数量")
+                    int problemSuitable = 0;
+//        @ApiModelProperty("有效性数量")
+                    int problemEffective = 0;
+
+                    for (PostCheckedProblem postCheckedProblem : value) {
+                        if (postCheckedProblem.getProblemAttribute() == 1){
+                            problemComplete++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 2){
+                            problemEffective++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 3){
+                            problemSuitable++;
+                        }
+                    }
+                    data.setProblemComplete(problemComplete);// 完整性数量
+                    data.setProblemSuitable(problemSuitable);// 适宜性数量
+                    data.setProblemEffective(problemEffective);// 有效性数量
+                    list.add(data);
+                }
+            }
+        }
 
 
-        List<ProblemAttributeCategoryView> list = new ArrayList<>();
-        ProblemAttributeCategoryView data = new ProblemAttributeCategoryView();
 //        data.set完成性
 //        data.set适宜性
 //        data.set有效性
@@ -908,8 +967,97 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
 //        data.set任职资格
 //        data.set其他
 
-        list.add(data);
+
         return null;
     }
+
+    @Override
+    public List<HistoryProblemNumberView> historyProblemNumberView(Integer type) {
+        //         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+
+        List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(type);
+        if (deptIdListByType == null && deptIdListByType.size() == 0){
+            throw new IllegalArgumentException("查询职能部门个数为:0");
+        }
+        List<String> deptIds = deptIdListByType.stream().map(d -> d.get("deptId").toString()).distinct().collect(Collectors.toList());
+        // 查询职能问题数量
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
+                .in(PostCheckedProblem::getCheckedDeptId, deptIds)
+        );
+        List<HistoryProblemNumberView> list = new ArrayList<>();
+        if (postCheckedProblems!=null && postCheckedProblems.size()>0){
+            SimpleDateFormat adf = new SimpleDateFormat("yyyy-MM-dd");
+            Map<String, List<PostCheckedProblem>> collect = postCheckedProblems.stream().collect(Collectors.groupingBy(d -> adf.format(d.getCreateTime()), Collectors.toList()));
+            HistoryProblemNumberView data = new HistoryProblemNumberView();
+            data.setCheckYear(new Date());
+            //        @ApiModelProperty("总数量")
+            int problemTotal = 0;
+//        @ApiModelProperty("完整性数量")
+            int problemComplete = 0;
+//        @ApiModelProperty("适宜性数量")
+            int problemSuitable = 0;
+//        @ApiModelProperty("有效性数量")
+            int problemEffective = 0;
+//        @ApiModelProperty("职责权限问题")
+            int problemCategoryOne = 0;
+//        @ApiModelProperty("工作内容问题")
+            int problemCategoryTwo = 0;
+//        @ApiModelProperty("工作标准问题")
+            int problemCategoryThree = 0;
+//        @ApiModelProperty("考核奖励问题")
+            int problemCategoryFour = 0;
+//        @ApiModelProperty("任职资格问题")
+            int problemCategoryFive = 0;
+//        @ApiModelProperty("其他")
+            int problemCategorySix = 0;
+            for (Map.Entry<String, List<PostCheckedProblem>> stringListEntry : collect.entrySet()) {
+                List<PostCheckedProblem> value = stringListEntry.getValue();
+                if (value!=null && value.size()>0){
+                    for (PostCheckedProblem postCheckedProblem : value) {
+                        problemTotal++;
+                        if (postCheckedProblem.getProblemAttribute() == 1){
+                            problemComplete++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 2){
+                            problemEffective++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 3){
+                            problemSuitable++;
+                        }
+                        if (postCheckedProblem.getProblemCategory() == null )
+                            continue;
+                        if (postCheckedProblem.getProblemCategory().equals("1"))
+                            problemCategoryOne++;
+                        if (postCheckedProblem.getProblemCategory().equals("2"))
+                            problemCategoryTwo++;
+                        if (postCheckedProblem.getProblemCategory().equals("3"))
+                            problemCategoryThree++;
+                        if (postCheckedProblem.getProblemCategory().equals("4"))
+                            problemCategoryFour++;
+                        if (postCheckedProblem.getProblemCategory().equals("5"))
+                            problemCategoryFive++;
+                        if (postCheckedProblem.getProblemCategory().equals("6"))
+                            problemCategorySix++;
+                    }
+                }
+            }
+            data.setProblemTotal(problemTotal);
+            data.setProblemComplete(problemComplete);
+            data.setProblemSuitable(problemSuitable);
+            data.setProblemEffective(problemEffective);
+            data.setProblemCategoryOne(problemCategoryOne);
+            data.setProblemCategoryTwo(problemCategoryTwo);
+            data.setProblemCategoryThree(problemCategoryThree);
+            data.setProblemCategoryFour(problemCategoryFour);
+            data.setProblemCategoryFive(problemCategoryFive);
+            data.setProblemCategorySix(problemCategorySix);
+            list.add(data);
+        }
+        return list;
+    }
 }