Merge remote-tracking branch 'origin/master'

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

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

@@ -169,4 +169,15 @@ public class PostAssessmentRatingController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(postAssessmentRatingService.deletePostAssessmentRatingByIds(ids));
     }
+
+
+    /**
+     * 根据部门查询问题
+     */
+    @ApiOperation("根据部门查询问题")
+    @ApiImplicitParam(name = "deptId", value = "Long类型的主键", dataType = "Long", dataTypeClass = Long.class)
+    @GetMapping("/{deptId}")
+    public AjaxResult getProblemByDeptId(@PathVariable Long deptId) {
+        return success(postAssessmentRatingService.getProblemByDeptId(deptId));
+    }
 }

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

@@ -42,54 +42,20 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        select * from "public"."post_checked_problem";
 //        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
 //        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
-
         List<FunctionDeptProblemContrastView> list = new ArrayList<>();
-        FunctionDeptProblemContrastView data = new FunctionDeptProblemContrastView();
-        data.setDeptId(100l);
-        data.setDeptName("测试部门1");
-        data.setProblemTotal(6);
-        data.setProblemComplete(1);
-        data.setProblemSuitable(2);
-        data.setProblemEffective(3);
-
-        data.setProblemCategoryOne(1);
-        data.setProblemCategoryTwo(1);
-        data.setProblemCategoryThree(1);
-        data.setProblemCategoryFour(1);
-        data.setProblemCategoryFive(1);
-        data.setProblemCategorySix(1);
 
-        list.add(data);
-        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
-        data1.setDeptId(101l);
-        data1.setDeptName("测试部门2");
-//        data1.setProblemTotal(6);
-//        data1.setProblemComplete(1);
-//        data1.setProblemSuitable(2);
-        data1.setProblemEffective(3);
-        data1.setProblemCategoryOne(1);
-        data1.setProblemCategoryTwo(1);
-        data1.setProblemCategoryThree(2);
-        data1.setProblemCategoryFour(1);
-        data1.setProblemCategoryFive(4);
-        data1.setProblemCategorySix(1);
-        list.add(data1);
+        Integer type = 1;
+        List<Map<String, Object>> deptIdListByType = postCheckedProblemService.getDeptIdListByType(type);
+        if (deptIdListByType!=null && deptIdListByType.size()>0){
+            for (Map<String, Object> map : deptIdListByType) {
+                FunctionDeptProblemContrastView data = new FunctionDeptProblemContrastView();
+                data.setDeptId(Long.parseLong(map.get("deptId").toString()));
+                data.setDeptName(String.valueOf(map.get("deptName")));
+                postCheckedProblemService.functionDeptProblemContrast(data);
+                list.add(data);
+            }
+        }
 
-        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
-        data2.setDeptId(102l);
-        data2.setDeptName("测试部门3");
-        data2.setProblemTotal(6);
-        data2.setProblemComplete(1);
-//        data2.setProblemSuitable(2);
-        data2.setProblemEffective(3);
-
-        data2.setProblemCategoryOne(1);
-//        data2.setProblemCategoryTwo(1);
-        data2.setProblemCategoryThree(1);
-//        data2.setProblemCategoryFour(1);
-        data2.setProblemCategoryFive(1);
-        data2.setProblemCategorySix(4);
-        list.add(data2);
         return success(list);
     }
 
@@ -103,13 +69,8 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        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 = 1;
+        return success(postCheckedProblemService.coverageRateView(type));
     }
 
     @ApiOperation("3-岗检问题职责类别占比")
@@ -120,15 +81,8 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        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 = 1;
+        return success(postCheckedProblemService.dutyTypeProblemStatisticsView(type));
     }
 
     @ApiOperation("4-岗检问题级别占比")
@@ -138,14 +92,8 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        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 = 1;
+        return success(postCheckedProblemService.problemLevelView(type));
     }
 
 
@@ -234,8 +182,10 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
         data6.setProblemSuitable(2);// 适宜性数量
         data6.setProblemEffective(3);// 有效性数量
         list.add(data6);
+//=======================以上是模拟数据供参考=================
 
-        return success(list);
+        Integer type = 1;
+        return success(postCheckedProblemService.problemAttributeCategoryView(type));
     }
 
 

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

@@ -14,6 +14,16 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
 
 /**
  * 岗检问题表Controller
@@ -31,62 +41,24 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 
     @ApiOperation("1-职能部各部门问题数量对比")
     @GetMapping("/functionDeptProblemContrast")
-    public AjaxResult functionDeptProblemContrast(FunctionDeptProblemContrastView notParam) { //notParam不是参数-是返回信息-方便接口联调
+    public AjaxResult functionDeptProblemContrast() { //notParam不是参数-是返回信息-方便接口联调
 //         查询问题表
 //        select * from "public"."post_checked_problem";
 //        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
 //        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
 
         List<FunctionDeptProblemContrastView> list = new ArrayList<>();
-        FunctionDeptProblemContrastView data = new FunctionDeptProblemContrastView();
-        data.setDeptId(100l);
-        data.setDeptName("测试部门1");
-        data.setProblemTotal(6);
-        data.setProblemComplete(1);
-        data.setProblemSuitable(2);
-        data.setProblemEffective(3);
-
-        data.setProblemCategoryOne(1);
-        data.setProblemCategoryTwo(1);
-        data.setProblemCategoryThree(1);
-        data.setProblemCategoryFour(1);
-        data.setProblemCategoryFive(1);
-        data.setProblemCategorySix(1);
-        list.add(data);
-
-
-        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
-        data1.setDeptId(101l);
-        data1.setDeptName("测试部门2");
-//        data1.setProblemTotal(6);
-//        data1.setProblemComplete(1);
-//        data1.setProblemSuitable(2);
-        data1.setProblemEffective(3);
-        data1.setProblemCategoryOne(1);
-        data1.setProblemCategoryTwo(1);
-        data1.setProblemCategoryThree(2);
-        data1.setProblemCategoryFour(1);
-        data1.setProblemCategoryFive(4);
-        data1.setProblemCategorySix(1);
-        list.add(data1);
-
-        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
-        data2.setDeptId(102l);
-        data2.setDeptName("测试部门3");
-        data2.setProblemTotal(6);
-        data2.setProblemComplete(1);
-//        data2.setProblemSuitable(2);
-        data2.setProblemEffective(3);
-
-        data2.setProblemCategoryOne(1);
-//        data2.setProblemCategoryTwo(1);
-        data2.setProblemCategoryThree(1);
-//        data2.setProblemCategoryFour(1);
-        data2.setProblemCategoryFive(1);
-        data2.setProblemCategorySix(4);
-        list.add(data2);
-
-
+        Integer type = 2;
+        List<Map<String, Object>> deptIdListByType = postCheckedProblemService.getDeptIdListByType(type);
+        if (deptIdListByType!=null && deptIdListByType.size()>0){
+            for (Map<String, Object> map : deptIdListByType) {
+                FunctionDeptProblemContrastView data = new FunctionDeptProblemContrastView();
+                data.setDeptId(Long.parseLong(map.get("deptId").toString()));
+                data.setDeptName(String.valueOf(map.get("deptName")));
+                postCheckedProblemService.functionDeptProblemContrast(data);
+                list.add(data);
+            }
+        }
         return success(list);
     }
 

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

@@ -3,6 +3,16 @@ package com.ruoyi.postCheck.service;
 import java.util.List;
 import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.postCheck.domain.PostCheckedProblem;
+
+
+
+
+
+
+
+
+
 
 /**
  * 考核评比Service接口
@@ -59,4 +69,6 @@ public interface IPostAssessmentRatingService extends IService<PostAssessmentRat
      * @return 结果
      */
     public int deletePostAssessmentRatingById(Long id);
+
+    List<PostCheckedProblem> getProblemByDeptId(Long id);
 }

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

@@ -5,21 +5,27 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.postCheck.domain.homePage.DeptProblemRectificationView;
 import com.ruoyi.postCheck.domain.homePage.PostCheckedProblemView;
 import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
-import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+import com.ruoyi.postCheck.domain.problemStatistics.CoverageRateView;
+import com.ruoyi.postCheck.domain.problemStatistics.DutyTypeProblemStatisticsView;
+import com.ruoyi.postCheck.domain.problemStatistics.FunctionDeptProblemContrastView;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemAttributeCategoryView;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemLevelView;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PutMapping;
+
+
+
+
+
+
+
+
+
 
 /**
  * 岗检问题表Service接口
@@ -179,4 +185,16 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
      * @return
      */
     List<ProblemCategory> problemCategoryByAttribute();
+
+    List<Map<String, Object>> getDeptIdListByType(Integer type);
+
+    void functionDeptProblemContrast(FunctionDeptProblemContrastView data);
+
+    List<CoverageRateView>  coverageRateView(Integer type);
+
+    List<DutyTypeProblemStatisticsView> dutyTypeProblemStatisticsView(Integer type);
+
+    List<ProblemLevelView>  problemLevelView(Integer type);
+
+    List<ProblemAttributeCategoryView> problemAttributeCategoryView(Integer type);
 }

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

@@ -196,4 +196,11 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
     public int deletePostAssessmentRatingById(Long id) {
         return postAssessmentRatingMapper.deletePostAssessmentRatingById(id);
     }
+
+    @Override
+    public List<PostCheckedProblem> getProblemByDeptId(Long id) {
+        return postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
+            .eq(PostCheckedProblem::getCheckedDeptId,id)
+        );
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.ruoyi.postCheck.service.impl;
 
-import java.awt.dnd.DropTarget;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -26,16 +25,21 @@ import com.ruoyi.postCheck.domain.homePage.PostCheckedProblemView;
 import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
 import com.ruoyi.postCheck.domain.join.PostPlanJoinProblem;
-import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
+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.ProblemAttributeCategoryView;
+import com.ruoyi.postCheck.domain.problemStatistics.ProblemLevelView;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
+import com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherMapper;
 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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +51,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 
+
+
+
+
+
+
+
+
 /**
  * 岗检问题表Service业务层处理
  *
@@ -69,6 +81,9 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     private IPostPlanJoinProblemService postPlanJoinProblemService;
     @Autowired
     private PostListMapper postListMapper;
+    @Autowired
+    private PostAssessmentRatingOtherMapper postAssessmentRatingOtherMapper;
+
     /**
      * 查询岗检问题表
      *
@@ -515,11 +530,11 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         //（1-完整问题；2-有效性问题；3-适宜性问题；）
         if (!postCheckedProblems.isEmpty())
             for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
-                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 1)
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 1)
                     problemComplete++;
-                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 3)
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 3)
                     problemEffective++;
-                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 2)
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 2)
                     problemSuitable++;
             }
         PostCheckedProblemView post = new PostCheckedProblemView();
@@ -549,34 +564,34 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         //（1-完整问题；2-有效性问题；3-适宜性问题；4 总数）
         if (!postCheckedProblems.isEmpty())
             for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
-                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 1) {
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 1) {
                     problemComplete++;
-                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                    if (postCheckedProblem.getIsImmediatelyCorrected() != null && postCheckedProblem.getIsImmediatelyCorrected() == 1) {
                         overproblemComplete++;
                     }
                 }
-                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 3) {
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 3) {
                     problemEffective++;
-                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                    if (postCheckedProblem.getIsImmediatelyCorrected() != null && postCheckedProblem.getIsImmediatelyCorrected() == 1) {
                         overproblemEffective++;
                     }
                 }
-                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 2) {
+                if (postCheckedProblem.getProblemAttribute() != null && postCheckedProblem.getProblemAttribute() == 2) {
                     problemSuitable++;
-                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                    if (postCheckedProblem.getIsImmediatelyCorrected() != null && postCheckedProblem.getIsImmediatelyCorrected() == 1) {
                         overproblemSuitable++;
                     }
                 }
                 total++;
-                if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                if (postCheckedProblem.getIsImmediatelyCorrected() != null && postCheckedProblem.getIsImmediatelyCorrected() == 1) {
                     overtotal++;
                 }
             }
         Map<Integer, BigDecimal> map = new HashMap<>();
-        map.put(1, new BigDecimal(overproblemComplete).divide(new BigDecimal(problemComplete),4, RoundingMode.HALF_UP));
-        map.put(2, new BigDecimal(overproblemSuitable).divide(new BigDecimal(problemSuitable),4, RoundingMode.HALF_UP));
-        map.put(3, new BigDecimal(overproblemEffective).divide(new BigDecimal(problemEffective),4, RoundingMode.HALF_UP));
-        map.put(4, new BigDecimal(overtotal).divide(new BigDecimal(total),4, RoundingMode.HALF_UP));
+        map.put(1, new BigDecimal(overproblemComplete).divide(new BigDecimal(problemComplete), 4, RoundingMode.HALF_UP));
+        map.put(2, new BigDecimal(overproblemSuitable).divide(new BigDecimal(problemSuitable), 4, RoundingMode.HALF_UP));
+        map.put(3, new BigDecimal(overproblemEffective).divide(new BigDecimal(problemEffective), 4, RoundingMode.HALF_UP));
+        map.put(4, new BigDecimal(overtotal).divide(new BigDecimal(total), 4, RoundingMode.HALF_UP));
         return map;
 
     }
@@ -585,7 +600,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
     public List<DeptProblemRectificationView> deptProblemRectification() {
         List<DeptProblemRectificationView> dataList = new ArrayList<>();
         List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
-        if (!postCheckedProblems.isEmpty()){
+        if (!postCheckedProblems.isEmpty()) {
             Map<Long, List<PostCheckedProblem>> postMapListMap = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getCheckedDeptId));
             for (Map.Entry<Long, List<PostCheckedProblem>> entry : postMapListMap.entrySet()) {
                 DeptProblemRectificationView data1 = new DeptProblemRectificationView();
@@ -595,13 +610,13 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 Integer problemComplete = 0;
                 for (PostCheckedProblem postCheckedProblem : entry.getValue()) {
                     problemTotal++;
-                    if (postCheckedProblem.getIsRectificationCompleted()!=null&&postCheckedProblem.getIsRectificationCompleted() == 1){
+                    if (postCheckedProblem.getIsRectificationCompleted() != null && postCheckedProblem.getIsRectificationCompleted() == 1) {
                         problemComplete++;
                     }
                 }
                 data1.setProblemTotal(problemTotal);
                 data1.setProblemComplete(problemComplete);
-                data1.setProblemRectificationRate(new BigDecimal(problemComplete).divide(new BigDecimal(problemTotal),4, RoundingMode.HALF_UP));
+                data1.setProblemRectificationRate(new BigDecimal(problemComplete).divide(new BigDecimal(problemTotal), 4, RoundingMode.HALF_UP));
                 dataList.add(data1);
             }
         }
@@ -625,19 +640,19 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
      */
     @Override
     public List<ProblemCategory> problemCategoryByAttribute() {
-//        @ApiModelProperty("职责权限问题")
+////        @ApiModelProperty("职责权限问题")
 //        private Integer problemCategoryOne;
-//        @ApiModelProperty("工作内容问题")
+////        @ApiModelProperty("工作内容问题")
 //        private Integer problemCategoryTwo;
-//        @ApiModelProperty("工作标准问题")
+////        @ApiModelProperty("工作标准问题")
 //        private Integer problemCategoryThree;
-//        @ApiModelProperty("考核奖励问题")
+////        @ApiModelProperty("考核奖励问题")
 //        private Integer problemCategoryFour;
-//        @ApiModelProperty("任职资格问题")
+////        @ApiModelProperty("任职资格问题")
 //        private Integer problemCategoryFive;
-//        @ApiModelProperty("其他")
+////        @ApiModelProperty("其他")
 //        private Integer problemCategorySix;
-//        @ApiModelProperty("总数量")
+////        @ApiModelProperty("总数量")
 //        private Integer problemTotal;
 
         List<ProblemCategory> list = postCheckedProblemMapper.problemCategoryByAttribute();
@@ -690,5 +705,211 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         list.add(totalData);
         return list;
     }
+
+    @Override
+    public List<Map<String, Object>> getDeptIdListByType(Integer type) {
+        return postAssessmentRatingOtherMapper.getDeptIdListByType(type);
+    }
+
+    @Override
+    public void functionDeptProblemContrast(FunctionDeptProblemContrastView data) {
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
+                .eq(PostCheckedProblem::getCheckedDeptId, data.getDeptId())
+        );
+//        @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;
+        if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                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);
+    }
+
+    @Override
+    public List<CoverageRateView> coverageRateView(Integer type) {
+        //         查询问题表
+//        select * from "public"."post_checked_problem";
+//        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");
+        }
+        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<CoverageRateView> list = new ArrayList<>();
+        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());
+            data.setProblemComplete(collect.size());
+            list.add(data);
+        }
+        return list;
+    }
+
+    @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");
+        }
+        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<DutyTypeProblemStatisticsView> list = new ArrayList<>();
+        if (postCheckedProblems!=null && postCheckedProblems.size()>0){
+//            @ApiModelProperty("业务职责")
+             Integer dutyTypeOne = 0;
+
+//            @ApiModelProperty("党建及党风廉政")
+             Integer dutyTypeTwo = 0;
+
+//            @ApiModelProperty("安全环保职责")
+             Integer dutyTypeThree = 0;
+
+//            @ApiModelProperty("合规保密职")
+             Integer dutyTypeFour = 0;
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                if (postCheckedProblem.getDutyType() == 1)
+                    dutyTypeOne++;
+                if (postCheckedProblem.getDutyType() == 2)
+                    dutyTypeTwo++;
+                if (postCheckedProblem.getDutyType() == 3)
+                    dutyTypeThree++;
+                if (postCheckedProblem.getDutyType() == 4)
+                    dutyTypeFour++;
+            }
+            DutyTypeProblemStatisticsView data = new DutyTypeProblemStatisticsView();
+            data.setDutyTypeOne(dutyTypeOne);
+            data.setDutyTypeTwo(dutyTypeTwo);
+            data.setDutyTypeThree(dutyTypeThree);
+            data.setDutyTypeFour(dutyTypeFour);
+            list.add(data);
+        }
+
+
+        return list;
+    }
+
+    @Override
+    public List<ProblemLevelView> problemLevelView(Integer type) {
+        //         查询问题表
+//        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");
+        }
+        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<ProblemLevelView> list = new ArrayList<>();
+        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());
+            data.setProblemLeveTwo(postCheckedProblems.size() - collect.size());
+            list.add(data);
+        }
+
+        return list;
+    }
+
+    @Override
+    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");
+        }
+        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<>();
+        ProblemAttributeCategoryView data = new ProblemAttributeCategoryView();
+//        data.set完成性
+//        data.set适宜性
+//        data.set有效性
+//        data.set职责权限
+//        data.set工作内容
+//        data.set工作标准
+//        data.set考核奖励
+//        data.set任职资格
+//        data.set其他
+
+        list.add(data);
+        return null;
+    }
 }