Merge remote-tracking branch 'origin/master'

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

@@ -198,94 +198,77 @@ 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));
     }
 
-/*
     @ApiOperation("7-部门详情")
     @GetMapping("/deptDetaailView")
-    public AjaxResult deptDetaailView() {
+    public AjaxResult deptDetaailView(CheckedProblemDeptDetaailView notParam) { //notParam不是参数-是返回信息-方便接口联调
 //         查询问题表
 //        select * from "public"."post_checked_problem";
 //        group by duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
 //        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
 
 
-        List<DeptDetaailView> list = new ArrayList<>();
-
-        //TODO 第一步：得到4个职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-        //TODO 第二步：遍历职责类别 -> （总数和已完成数）设置问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
-        DeptDetaailView data1 = new DeptDetaailView();
-//        data4.setdutyTypeOne //业务职责
-        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
-//        child1.set完整性数量") private Integer problemComplete;
-//        child1.set适宜性数量") private Integer problemSuitable;
-//        child1.set有效性数量") private Integer problemEffective;
-//        child1.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child1.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child1.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child1);
-        data1.setChildren(children1);
+        List<CheckedProblemDeptDetaailView> list = new ArrayList<>();
+
+        //TODO 第一步：得到各个部门ID、部门名称、问题总数量、重要问题数量、一般问题数量、统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+
+
+        CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
+        data1.setDeptId(1l); //部门ID
+        data1.setDeptName("测试部门名称1");// 部门名称
+        data1.setProblemTotal(10); //问题数量
+        data1.setProblemLeveTwo(2); //重要问题
+        data1.setProblemLeveOne(8); //一般问题
+        data1.setStatisticsTime(new Date());// 统计时间
+
+//        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        child1.setProblemComplete(1); //child1.set完整性数量
+        child1.setProblemSuitable(2); //child1.set适宜性数量
+        child1.setProblemEffective(3);//child1.set有效性数量
+        //children1.add(child1);
+        //data1.setChildren(children1);
+        data1.getChildren().add(child1);
         list.add(data1);
 
-        DeptDetaailView data2 = new DeptDetaailView();
-//        data4.setdutyTypeTwo 党建及党风廉政
-        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
-//        child2.set完整性数量") private Integer problemComplete;
-//        child2.set适宜性数量") private Integer problemSuitable;
-//        child2.set有效性数量") private Integer problemEffective;
-//        child2.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child2.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child2.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child2);
-        data2.setChildren(children2);
+        CheckedProblemDeptDetaailView data2 = new CheckedProblemDeptDetaailView();
+        data2.setDeptId(2l); //部门ID
+        data2.setDeptName("测试部门名称2");// 部门名称
+        data2.setProblemTotal(9); //问题数量
+        data2.setProblemLeveTwo(2); //重要问题
+        data2.setProblemLeveOne(7); //一般问题
+        data2.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child2 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data2.getChildren().add(child2);
         list.add(data2);
 
-        DeptDetaailView data3 = new DeptDetaailView();
-//        data4.setdutyTypeThree 安全环保职责
-        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
-//        child3.set完整性数量") private Integer problemComplete;
-//        child3.set适宜性数量") private Integer problemSuitable;
-//        child3.set有效性数量") private Integer problemEffective;
-//        child3.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child3.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child3.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child3);
-        data3.setChildren(children3);
+        CheckedProblemDeptDetaailView data3 = new CheckedProblemDeptDetaailView();
+        data3.setDeptId(3l); //部门ID
+        data3.setDeptName("测试部门名称3");// 部门名称
+        data3.setProblemTotal(8); //问题数量
+        data3.setProblemLeveTwo(3); //重要问题
+        data3.setProblemLeveOne(5); //一般问题
+        data3.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child3 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data3.getChildren().add(child3);
         list.add(data3);
 
-        DeptDetaailView data4 = new DeptDetaailView();
-//        data4.setdutyTypeFour 合规保密职
-        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
-//        child4.set完整性数量") private Integer problemComplete;
-//        child4.set适宜性数量") private Integer problemSuitable;
-//        child4.set有效性数量") private Integer problemEffective;
-//        child4.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child4.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child4.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child4);
-        data4.setChildren(children4);
+        CheckedProblemDeptDetaailView data4 = new CheckedProblemDeptDetaailView();
+        data4.setDeptId(4l); //部门ID
+        data4.setDeptName("测试部门名称4");// 部门名称
+        data4.setProblemTotal(6); //问题数量
+        data4.setProblemLeveTwo(1); //重要问题
+        data4.setProblemLeveOne(5); //一般问题
+        data4.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child4 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data4.getChildren().add(child4);
         list.add(data4);
-        return success(list);
+        Integer type = 1;
+        return success(postCheckedProblemService.deptDetaailView(type));
     }
-    */
 }

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

@@ -64,13 +64,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        is_rectification_completed = 1 整改情况-是否完成(1-Yes；2-No；)
 
 
-        List<CoverageRateView> list = new ArrayList<>();
-        CoverageRateView data = new CoverageRateView();
-        data.setProblemTotal(6);
-        data.setProblemComplete(5);
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.coverageRateView(type));
     }
 
     @ApiOperation("3-岗检问题职责类别占比")
@@ -81,15 +76,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        group by duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
 
 
-        List<DutyTypeProblemStatisticsView> list = new ArrayList<>();
-        DutyTypeProblemStatisticsView data = new DutyTypeProblemStatisticsView();
-        data.setDutyTypeOne(1);
-        data.setDutyTypeTwo(2);
-        data.setDutyTypeThree(3);
-        data.setDutyTypeFour(4);
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.dutyTypeProblemStatisticsView(type));
     }
 
     @ApiOperation("4-岗检问题级别占比")
@@ -99,14 +87,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        select * from "public"."post_checked_problem";
 //        group by problem_level   问题等级（一般、重要）
 
-        List<ProblemLevelView> list = new ArrayList<>();
-        ProblemLevelView data = new ProblemLevelView();
-        data.setProblemLeveOne(2);
-        data.setProblemLeveTwo(1);
-
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.problemLevelView(type));
     }
 
 
@@ -197,7 +179,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
         list.add(data6);
 
 
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.problemAttributeCategoryView(type));
     }
 
 
@@ -224,8 +207,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        data.set任职资格
 //        data.set其他
 
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.historyProblemNumberView(type));
     }
 
 

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

@@ -11,9 +11,11 @@ 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.CheckedProblemDeptDetaailView;
 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 +199,8 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
     List<ProblemLevelView>  problemLevelView(Integer type);
 
     List<ProblemAttributeCategoryView> problemAttributeCategoryView(Integer type);
+
+    List<HistoryProblemNumberView>  historyProblemNumberView(Integer type);
+
+    List<CheckedProblemDeptDetaailView>  deptDetaailView(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;
@@ -25,9 +26,11 @@ 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.CheckedProblemDeptDetaailView;
 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 +52,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;
 
 
 
@@ -743,16 +747,16 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
             for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
                 problemTotal++;
-                if (postCheckedProblem.getProblemAttribute() == 1){
+                if (postCheckedProblem.getProblemAttribute() == 1) {
                     problemComplete++;
                 }
-                if (postCheckedProblem.getProblemAttribute() == 2){
+                if (postCheckedProblem.getProblemAttribute() == 2) {
                     problemEffective++;
                 }
-                if (postCheckedProblem.getProblemAttribute() == 3){
+                if (postCheckedProblem.getProblemAttribute() == 3) {
                     problemSuitable++;
                 }
-                if (postCheckedProblem.getProblemCategory() == null )
+                if (postCheckedProblem.getProblemCategory() == null)
                     continue;
                 if (postCheckedProblem.getProblemCategory().equals("1"))
                     problemCategoryOne++;
@@ -787,8 +791,8 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
 //        status = 40    状态：1-待指定整改人（问题录入完成时）；2-待填写方案（部门管理员指定整改人后）；3-方案填写完成；10-部门审核通过；11-部门审核驳回；20-专业部门人审核（非必填）通过；21-专业部门人审核驳回（非必填）；30-整改人待上传实施（整改人上传实施图片）；31-上传实施照片完成；40-复查部门人审核通过；41-复查部门人审核驳回
 //        is_rectification_completed = 1 整改情况-是否完成(1-Yes；2-No；)
         List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(type);
-        if (deptIdListByType == null && deptIdListByType.size() == 0){
-            throw new IllegalArgumentException("查询职能部门个数为:0");
+        if (deptIdListByType == null || deptIdListByType.size() == 0) {
+            return new ArrayList<>();
         }
         List<String> deptIds = deptIdListByType.stream().map(d -> d.get("deptId").toString()).distinct().collect(Collectors.toList());
         // 查询职能问题数量
@@ -796,10 +800,10 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 .in(PostCheckedProblem::getCheckedDeptId, deptIds)
         );
         List<CoverageRateView> list = new ArrayList<>();
-        if (postCheckedProblems!=null && postCheckedProblems.size()>0){
+        if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
             CoverageRateView data = new CoverageRateView();
             data.setProblemTotal(postCheckedProblems.size());
-            List<PostCheckedProblem> collect = postCheckedProblems.stream().filter(d -> d.getIsRectificationCompleted().equals(1)).collect(Collectors.toList());
+            List<PostCheckedProblem> collect = postCheckedProblems.stream().filter(d -> d.getIsRectificationCompleted() != null && d.getIsRectificationCompleted().equals(1)).collect(Collectors.toList());
             data.setProblemComplete(collect.size());
             list.add(data);
         }
@@ -809,8 +813,8 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     @Override
     public List<DutyTypeProblemStatisticsView> dutyTypeProblemStatisticsView(Integer type) {
         List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(type);
-        if (deptIdListByType == null && deptIdListByType.size() == 0){
-            throw new IllegalArgumentException("查询职能部门个数为:0");
+        if (deptIdListByType == null || deptIdListByType.size() == 0) {
+            return new ArrayList<>();
         }
         List<String> deptIds = deptIdListByType.stream().map(d -> d.get("deptId").toString()).distinct().collect(Collectors.toList());
         // 查询职能问题数量
@@ -818,18 +822,18 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 .in(PostCheckedProblem::getCheckedDeptId, deptIds)
         );
         List<DutyTypeProblemStatisticsView> list = new ArrayList<>();
-        if (postCheckedProblems!=null && postCheckedProblems.size()>0){
+        if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
 //            @ApiModelProperty("业务职责")
-             Integer dutyTypeOne = 0;
+            Integer dutyTypeOne = 0;
 
 //            @ApiModelProperty("党建及党风廉政")
-             Integer dutyTypeTwo = 0;
+            Integer dutyTypeTwo = 0;
 
 //            @ApiModelProperty("安全环保职责")
-             Integer dutyTypeThree = 0;
+            Integer dutyTypeThree = 0;
 
 //            @ApiModelProperty("合规保密职")
-             Integer dutyTypeFour = 0;
+            Integer dutyTypeFour = 0;
             for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
                 if (postCheckedProblem.getDutyType() == 1)
                     dutyTypeOne++;
@@ -858,8 +862,8 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
 //        select * from "public"."post_checked_problem";
 //        group by problem_level   问题等级（一般、重要）
         List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(type);
-        if (deptIdListByType == null && deptIdListByType.size() == 0){
-            throw new IllegalArgumentException("查询职能部门个数为:0");
+        if (deptIdListByType == null || deptIdListByType.size() == 0) {
+            return new ArrayList<>();
         }
         List<String> deptIds = deptIdListByType.stream().map(d -> d.get("deptId").toString()).distinct().collect(Collectors.toList());
         // 查询职能问题数量
@@ -867,7 +871,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 .in(PostCheckedProblem::getCheckedDeptId, deptIds)
         );
         List<ProblemLevelView> list = new ArrayList<>();
-        if (postCheckedProblems!=null && postCheckedProblems.size()>0){
+        if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
             List<PostCheckedProblem> collect = postCheckedProblems.stream().filter(d -> d.getProblemLevel() != null && d.getProblemLevel().equals("2")).collect(Collectors.toList());
             ProblemLevelView data = new ProblemLevelView();
             data.setProblemLeveOne(collect.size());
@@ -879,25 +883,81 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     }
 
     @Override
-    public  List<ProblemAttributeCategoryView> problemAttributeCategoryView(Integer type) {
+    public List<ProblemAttributeCategoryView> problemAttributeCategoryView(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");
+        if (deptIdListByType == null || deptIdListByType.size() == 0) {
+            return new ArrayList<>();
         }
         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<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,7 +968,192 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
 //        data.set任职资格
 //        data.set其他
 
-        list.add(data);
+
+        return list;
+    }
+
+    @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) {
+            return new ArrayList<>();
+        }
+        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;
+    }
+
+    @Override
+    public List<CheckedProblemDeptDetaailView> deptDetaailView(Integer type) {
+        List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(type);
+        if (deptIdListByType == null || deptIdListByType.size() == 0) {
+            return new ArrayList<>();
+        }
+        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<CheckedProblemDeptDetaailView> list = new ArrayList<>();
+
+        //TODO 第一步：得到各个部门ID、部门名称、问题总数量、重要问题数量、一般问题数量、统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+        if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
+            Map<Long, List<PostCheckedProblem>> deptMap = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getCheckedDeptId));
+            for (Map.Entry<Long, List<PostCheckedProblem>> longListEntry : deptMap.entrySet()) {
+                Long key = longListEntry.getKey();
+                List<PostCheckedProblem> value = longListEntry.getValue();
+                CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
+                data1.setDeptId(key); //部门ID
+                data1.setDeptName(postAssessmentRatingMapper.getSysDeptName(key));// 部门名称
+                int problemTotal = 0;
+//    @ApiModelProperty("一般")
+                Integer problemLeveOne = 0;
+//    @ApiModelProperty("重要")
+                Integer problemLeveTwo = 0;
+                for (PostCheckedProblem postCheckedProblem : value) {
+                    problemTotal++;
+                    if (postCheckedProblem.getProblemLevel().equals("1")){
+                        problemLeveOne++;
+                    }
+                    if (postCheckedProblem.getProblemLevel().equals("2")){
+                        problemLeveTwo++;
+                    }
+                }
+                data1.setProblemTotal(problemTotal); //问题数量
+                data1.setProblemLeveTwo(problemLeveTwo); //重要问题
+                data1.setProblemLeveOne(problemLeveOne); //一般问题
+                Map<Integer, List<PostCheckedProblem>> dutyMap = value.stream().collect(Collectors.groupingBy(PostCheckedProblem::getDutyType));
+
+
+                for (Map.Entry<Integer, List<PostCheckedProblem>> integerListEntry : dutyMap.entrySet()) {
+                    //        @ApiModelProperty("完整性数量")
+                    int problemComplete = 0;
+//        @ApiModelProperty("适宜性数量")
+                    int problemSuitable = 0;
+//        @ApiModelProperty("有效性数量")
+                    int problemEffective = 0;
+                    Integer duty = integerListEntry.getKey();
+                    CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+                    child1.setDutyType(duty);
+                    List<PostCheckedProblem> postCheckedProblemList = integerListEntry.getValue();
+                    for (PostCheckedProblem postCheckedProblem : postCheckedProblemList) {
+                        if (postCheckedProblem.getProblemAttribute() == 1) {
+                            problemComplete++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 2) {
+                            problemEffective++;
+                        }
+                        if (postCheckedProblem.getProblemAttribute() == 3) {
+                            problemSuitable++;
+                        }
+                    }
+                    child1.setProblemComplete(problemComplete);
+                    child1.setProblemEffective(problemEffective);
+                    child1.setProblemSuitable(problemSuitable);
+                }
+                list.add(data1);
+            }
+        }
+
+
+//        data1.setDeptId(1l); //部门ID
+//        data1.setDeptName("测试部门名称1");// 部门名称
+//        data1.setProblemTotal(10); //问题数量
+//        data1.setProblemLeveTwo(2); //重要问题
+//        data1.setProblemLeveOne(8); //一般问题
+//        data1.setStatisticsTime(new Date());// 统计时间
+//
+//        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+//        CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+//        child1.setProblemComplete(1); //child1.set完整性数量
+//        child1.setProblemSuitable(2); //child1.set适宜性数量
+//        child1.setProblemEffective(3);//child1.set有效性数量
+//        //children1.add(child1);
+//        //data1.setChildren(children1);
+//        data1.getChildren().add(child1);
+
+
         return null;
     }
 }