Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,16 @@
+package com.post;
+
+import com.ruoyi.common.utils.Arith;
+
+import java.math.BigDecimal;
+
+public class Test01 {
+    public static void main(String[] args) {
+        double round = Arith.round(new BigDecimal(99.98).doubleValue(), 2);
+        System.out.println(round);
+        System.out.println(new BigDecimal(round).doubleValue());
+    }
+    public void ss(){
+
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
@@ -23,25 +24,21 @@ import com.ruoyi.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author ruoyi
  */
-public class BaseController
-{
+public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
      */
     @InitBinder
-    public void initBinder(WebDataBinder binder)
-    {
+    public void initBinder(WebDataBinder binder) {
         // Date 类型转换
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
-        {
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
             @Override
-            public void setAsText(String text)
-            {
+            public void setAsText(String text) {
                 setValue(DateUtils.parseDate(text));
             }
         });
@@ -50,19 +47,25 @@ public class BaseController
     /**
      * 设置请求分页数据
      */
-    protected void startPage()
-    {
+    protected void startPage() {
         PageUtils.startPage();
     }
 
+    protected void startPage(String isAsc, String orderByColumn) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String orderBy = SqlUtil.escapeOrderBySql(orderByColumn + " " + isAsc);
+        Boolean reasonable = pageDomain.getReasonable();
+        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+    }
+
     /**
      * 设置请求排序数据
      */
-    protected void startOrderBy()
-    {
+    protected void startOrderBy() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
-        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
-        {
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
             String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
             PageHelper.orderBy(orderBy);
         }
@@ -71,17 +74,15 @@ public class BaseController
     /**
      * 清理分页的线程变量
      */
-    protected void clearPage()
-    {
+    protected void clearPage() {
         PageUtils.clearPage();
     }
 
     /**
      * 响应请求分页数据
      */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    protected TableDataInfo getDataTable(List<?> list)
-    {
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    protected TableDataInfo getDataTable(List<?> list) {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setMsg("查询成功");
@@ -93,110 +94,97 @@ public class BaseController
     /**
      * 返回成功
      */
-    public AjaxResult success()
-    {
+    public AjaxResult success() {
         return AjaxResult.success();
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error()
-    {
+    public AjaxResult error() {
         return AjaxResult.error();
     }
 
     /**
      * 返回成功消息
      */
-    public AjaxResult success(String message)
-    {
+    public AjaxResult success(String message) {
         return AjaxResult.success(message);
     }
-    
+
     /**
      * 返回成功消息
      */
-    public AjaxResult success(Object data)
-    {
+    public AjaxResult success(Object data) {
         return AjaxResult.success(data);
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error(String message)
-    {
+    public AjaxResult error(String message) {
         return AjaxResult.error(message);
     }
 
     /**
      * 返回警告消息
      */
-    public AjaxResult warn(String message)
-    {
+    public AjaxResult warn(String message) {
         return AjaxResult.warn(message);
     }
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected AjaxResult toAjax(int rows)
-    {
+    protected AjaxResult toAjax(int rows) {
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param result 结果
      * @return 操作结果
      */
-    protected AjaxResult toAjax(boolean result)
-    {
+    protected AjaxResult toAjax(boolean result) {
         return result ? success() : error();
     }
 
     /**
      * 页面跳转
      */
-    public String redirect(String url)
-    {
+    public String redirect(String url) {
         return StringUtils.format("redirect:{}", url);
     }
 
     /**
      * 获取用户缓存信息
      */
-    public LoginUser getLoginUser()
-    {
+    public LoginUser getLoginUser() {
         return SecurityUtils.getLoginUser();
     }
 
     /**
      * 获取登录用户id
      */
-    public Long getUserId()
-    {
+    public Long getUserId() {
         return getLoginUser().getUserId();
     }
 
     /**
      * 获取登录部门id
      */
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return getLoginUser().getDeptId();
     }
 
     /**
      * 获取登录用户名
      */
-    public String getUsername()
-    {
+    public String getUsername() {
         return getLoginUser().getUsername();
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.utils.sql.SqlUtil;
 
 /**
  * 分页工具类
- * 
+ *
  * @author ruoyi
  */
 public class PageUtils extends PageHelper
@@ -25,6 +25,7 @@ public class PageUtils extends PageHelper
         PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
     }
 
+
     /**
      * 清理分页的线程变量
      */

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

@@ -148,29 +148,31 @@ public class PostCheckedController extends BaseController {
 
     /**
      * 修改岗检表管理
-     @ApiOperation("修改岗检表管理")
-     @ApiImplicitParams({
-     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
-     @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
-     @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
-     @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
-     @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
-     @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
-     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
-     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
-     })
-     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:edit')")
-     @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
-     @PutMapping public AjaxResult edit(@RequestBody PostChecked postChecked) {
-     return toAjax(postCheckedService.updatePostChecked(postChecked));
-     }
      */
+    @ApiOperation("修改岗检表管理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
+//     @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
+//     @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+//     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
+    })
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:edit')")
+    @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PostChecked postChecked) {
+        return toAjax(postCheckedService.updatePostChecked(postChecked));
+    }
 
     /**
      * 删除岗检表管理

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

@@ -0,0 +1,247 @@
+package com.ruoyi.postCheck.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.postCheck.domain.homePage.AssessmentRatingView;
+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.problemStatistics.*;
+import com.ruoyi.postCheck.service.IPostCheckedProblemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 岗检问题表Controller
+ *
+ * @author csg
+ * @date 2023-12-23
+ */
+@Api(tags = "5.1.1-统计分析-检查统计-问题统计（职能管理）")
+@RestController
+@RequestMapping("/postCheck/functionProblemStatistics")
+public class PostCheckedFunctionProblemStatisticsController extends BaseController {
+    @Autowired
+    private IPostCheckedProblemService postCheckedProblemService;
+
+
+    @ApiOperation("1-职能部各部门问题数量对比")
+    @GetMapping("/functionDeptProblemContrast")
+//    @ApiImplicitParam(name = "notParam", value = "V2方便接口联调-这是返回信息", dataType = "FunctionDeptProblemContrastView", dataTypeClass = FunctionDeptProblemContrastView.class)
+    public AjaxResult functionDeptProblemContrast(FunctionDeptProblemContrastView notParam) { //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);
+        return success(list);
+    }
+
+
+    @ApiOperation("2-岗检覆盖率")
+    @GetMapping("/coverageRateView")
+    public AjaxResult coverageRateView(CoverageRateView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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<CoverageRateView> list = new ArrayList<>();
+        CoverageRateView data = new CoverageRateView();
+        data.setProblemTotal(6);
+        data.setProblemComplete(5);
+
+        list.add(data);
+        return success(list);
+    }
+
+    @ApiOperation("3-岗检问题职责类别占比")
+    @GetMapping("/dutyTypeProblemStatisticsView")
+    public AjaxResult dutyTypeProblemStatisticsView(DutyTypeProblemStatisticsView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        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);
+    }
+
+    @ApiOperation("4-岗检问题级别占比")
+    @GetMapping("/problemLevelView")
+    public AjaxResult problemLevelView(ProblemLevelView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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);
+    }
+
+
+    @ApiOperation("5-岗检问题属性及类别整改占比")
+    @GetMapping("/problemAttributeCategoryView")
+    public AjaxResult problemAttributeCategoryView(ProblemAttributeCategoryView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+
+        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 success(list);
+    }
+
+
+    @ApiOperation("6-历年岗检问题数量")
+    @GetMapping("/historyProblemNumberView")
+    public AjaxResult historyProblemNumberView(HistoryProblemNumberView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        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);
+    }
+
+/*
+    @ApiOperation("7-部门详情")
+    @GetMapping("/deptDetaailView")
+    public AjaxResult deptDetaailView() {
+//         查询问题表
+//        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.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);
+        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);
+        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);
+        list.add(data4);
+        return success(list);
+    }
+    */
+}

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

@@ -3,7 +3,9 @@ package com.ruoyi.postCheck.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.Arith;
+import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.ruoyi.postCheck.domain.homePage.*;
+import com.ruoyi.postCheck.service.IPostAssessmentRatingService;
 import com.ruoyi.postCheck.service.IPostCheckedProblemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +16,16 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
+
+
+
+
+
+
+
+
+
 
 /**
  * 岗检问题表Controller
@@ -27,7 +39,8 @@ import java.util.*;
 public class PostCheckedHomePageController extends BaseController {
     @Autowired
     private IPostCheckedProblemService postCheckedProblemService;
-
+    @Autowired
+    private IPostAssessmentRatingService postAssessmentRatingService;
     /**
      * 1、责任制清单：post_list表
      * 2、检查出的问题：post_checked_problem表
@@ -58,61 +71,21 @@ public class PostCheckedHomePageController extends BaseController {
     @GetMapping("/checkedProblem")
     public AjaxResult checkedProblem() {
 //        检查出的问题：post_checked_problem表 按 problem_attribute-问题属性（1-完整问题；2-有效性问题；3-适宜性问题；） 分组 count(id)
-        List<PostCheckedProblemView> list = new ArrayList<>();
-        PostCheckedProblemView data = new PostCheckedProblemView();
-//        data.set
-//        data.set
-//        data.set
-        list.add(data);
-        return success(list);
+        return success(postCheckedProblemService.checkedProblem());
     }
 
 
     @ApiOperation("3-人员数量")
     @GetMapping("/userTotal")
     public AjaxResult userTotal() {
-//        查询人员表：sys_users
-        int userCount = 999;
-        return success(userCount);
+        return success(postCheckedProblemService.userTotal());
     }
 
 
     @ApiOperation("4-岗检问题整改率（中间饼状图 统计的 岗检问题整改率 和 岗检部门整改率 tab 切换时前端自己计算，不需要提供接口）")
     @GetMapping("/problemRectification")
     public AjaxResult problemRectification() {
-//        查询问题表：post_checked_problem
-//        group by problem_attribute 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
-//        最好给前端定义一个对象，用Map也可以
-        List<Map<Integer, BigDecimal>> dataList = new ArrayList<>();
-        Map<Integer, BigDecimal> data1 = new HashMap<>();
-        data1.put(0, new BigDecimal(Arith.round(new BigDecimal(0.9).doubleValue(), 2)));
-//        data1.put(1, new BigDecimal(0.95));//完整问题
-//        data1.put(2, new BigDecimal(0.88));//有效性问题
-//        data1.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data1);
-
-        Map<Integer, BigDecimal> data2 = new HashMap<>();
-//        data2.put(0, new BigDecimal(0.9));
-        data2.put(1, new BigDecimal(Arith.round(new BigDecimal(0.95).doubleValue(), 2)));//完整问题
-//        data2.put(2, new BigDecimal(0.88));//有效性问题
-//        data2.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data2);
-
-
-        Map<Integer, BigDecimal> data3 = new HashMap<>();
-//        data3.put(0, new BigDecimal(0.9));
-//        data3.put(1, new BigDecimal(0.95));//完整问题
-        data3.put(2, new BigDecimal(Arith.round(new BigDecimal(0.88).doubleValue(), 2)));//有效性问题
-//        data3.put(3, new BigDecimal(0.86));//适宜性问题
-        dataList.add(data3);
-
-        Map<Integer, BigDecimal> data4 = new HashMap<>();
-//        data4.put(0, new BigDecimal(0.9));
-//        data4.put(1, new BigDecimal(0.95));//完整问题
-//        data4.put(2, new BigDecimal(0.88));//有效性问题
-        data4.put(3, new BigDecimal(Arith.round(new BigDecimal(0.86).doubleValue(), 2)));//适宜性问题
-        dataList.add(data4);
-        return success(dataList);
+        return success(postCheckedProblemService.problemRectification());
     }
 
 
@@ -122,25 +95,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        查询问题表：post_checked_problem
 //        group by checked_dept_id 整改责任部门ID（被检查部门ID）
 //        最好给前端定义一个对象，用Map也可以
-        List<DeptProblemRectificationView> dataList = new ArrayList<>();
-        DeptProblemRectificationView data1 = new DeptProblemRectificationView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setProblemTotal(10);
-        data1.setProblemComplete(9);
-        data1.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.9).doubleValue(), 2)));
-        dataList.add(data1);
-
-
-        DeptProblemRectificationView data2 = new DeptProblemRectificationView();
-        data2.setDeptId(101l);
-        data2.setDeptName("测试部门V2");
-        data2.setProblemTotal(8);
-        data2.setProblemComplete(4);
-        data2.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.5).doubleValue(), 2)));
-        dataList.add(data2);
-
-        return success(dataList);
+        return success(postCheckedProblemService.deptProblemRectification());
     }
 
 
@@ -163,15 +118,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        select * from "public"."sys_users";
 //        select * from "public"."sys_user_post";
 
-        List<PostCheckedUnCheckedView> dataList = new ArrayList<>();
-        PostCheckedUnCheckedView data1 = new PostCheckedUnCheckedView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setPostId(1l);
-        data1.setPostName("内操岗位");
-        data1.setUserCount(99);
-        dataList.add(data1);
-        return success(dataList);
+        return success(postCheckedProblemService.postChecked(1));
     }
 
 
@@ -194,15 +141,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        select * from "public"."sys_users";
 //        select * from "public"."sys_user_post";
 
-        List<PostCheckedUnCheckedView> dataList = new ArrayList<>();
-        PostCheckedUnCheckedView data1 = new PostCheckedUnCheckedView();
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-        data1.setPostId(1l);
-        data1.setPostName("内操岗位");
-        data1.setUserCount(99);
-        dataList.add(data1);
-        return success(dataList);
+        return success(postCheckedProblemService.postChecked(2));
     }
 
 
@@ -218,18 +157,28 @@ public class PostCheckedHomePageController extends BaseController {
 
 //      部门得分 = （岗检分数 * 0.5 + 互评分数 * 0.5  ）
 //      根据部门得分进行排名计算
-
-
+        PostAssessmentRating postAssessmentRating1 = new PostAssessmentRating();
+        postAssessmentRating1.setType(1);
+        List<PostAssessmentRating> postAssessmentRatings1 = postAssessmentRatingService.selectPostAssessmentRatingList(postAssessmentRating1);
+        PostAssessmentRating postAssessmentRating2 = new PostAssessmentRating();
+        postAssessmentRating2.setType(2);
+        List<PostAssessmentRating> postAssessmentRatings2 = postAssessmentRatingService.selectPostAssessmentRatingList(postAssessmentRating2);
+        postAssessmentRatings1.addAll(postAssessmentRatings2);
         List<AssessmentRatingView> dataList = new ArrayList<>();
-        AssessmentRatingView data1 = new AssessmentRatingView();
-        data1.setRating(1);
-        data1.setDeptId(100l);
-        data1.setDeptName("测试部门V1");
-//        data1.setPostId(1l);
-//        data1.setPostName("内操岗位");
-        data1.setPostCount(6);
-        data1.setScore(new BigDecimal(Arith.round(new BigDecimal(99.98).doubleValue(), 2)));
-        dataList.add(data1);
-        return success(dataList);
+        postAssessmentRatings1.forEach(x->{
+            AssessmentRatingView data1 = new AssessmentRatingView();
+            data1.setDeptId(x.getDeptId());
+            data1.setDeptName(x.getDeptIdStr());
+            data1.setPostCount(postCheckedProblemService.getPostCountByDeptId(x.getDeptId()));
+            data1.setScore(x.getDepartmentScore());
+            dataList.add(data1);
+        });
+        List<AssessmentRatingView> collect = dataList.stream().sorted(Comparator.comparing(AssessmentRatingView::getScore).reversed()).collect(Collectors.toList());
+        Integer i = 1;
+        for (AssessmentRatingView x : collect) {
+            x.setRating(i);
+            i++;
+        }
+        return success(collect);
     }
 }

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/controller/PostCheckedProductionProblemStatisticsController.java

@@ -0,0 +1,253 @@
+package com.ruoyi.postCheck.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.postCheck.domain.problemStatistics.*;
+import com.ruoyi.postCheck.service.IPostCheckedProblemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 岗检问题表Controller
+ *
+ * @author csg
+ * @date 2023-12-23
+ */
+@Api(tags = "5.1.2-统计分析-检查统计-问题统计（生产运营）")
+@RestController
+@RequestMapping("/postCheck/productionProblemStatistics")
+public class PostCheckedProductionProblemStatisticsController extends BaseController {
+    @Autowired
+    private IPostCheckedProblemService postCheckedProblemService;
+
+
+    @ApiOperation("1-职能部各部门问题数量对比")
+    @GetMapping("/functionDeptProblemContrast")
+    public AjaxResult functionDeptProblemContrast(FunctionDeptProblemContrastView notParam) { //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);
+        return success(list);
+    }
+
+
+    @ApiOperation("2-岗检覆盖率")
+    @GetMapping("/coverageRateView")
+    public AjaxResult coverageRateView(CoverageRateView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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<CoverageRateView> list = new ArrayList<>();
+        CoverageRateView data = new CoverageRateView();
+        data.setProblemTotal(6);
+        data.setProblemComplete(5);
+
+        list.add(data);
+        return success(list);
+    }
+
+    @ApiOperation("3-岗检问题职责类别占比")
+    @GetMapping("/dutyTypeProblemStatisticsView")
+    public AjaxResult dutyTypeProblemStatisticsView(DutyTypeProblemStatisticsView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        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);
+    }
+
+    @ApiOperation("4-岗检问题级别占比")
+    @GetMapping("/problemLevelView")
+    public AjaxResult problemLevelView(ProblemLevelView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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);
+    }
+
+
+    @ApiOperation("5-岗检问题属性及类别整改占比")
+    @GetMapping("/problemAttributeCategoryView")
+    public AjaxResult problemAttributeCategoryView(ProblemAttributeCategoryView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+
+        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 success(list);
+    }
+
+
+    @ApiOperation("6-历年岗检问题数量")
+    @GetMapping("/historyProblemNumberView")
+    public AjaxResult historyProblemNumberView(HistoryProblemNumberView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        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);
+    }
+
+
+    @ApiOperation("7-部门详情")
+    @GetMapping("/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<CheckedProblemDeptDetaailView> list = new ArrayList<>();
+
+        //TODO 第一步：得到各个部门ID、部门名称、问题总数量、重要问题数量、一般问题数量、统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+
+
+
+        CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
+//        data1.setdeptId 部门ID
+//        data1.setdeptName 部门名称
+//        data1.setproblemTotal 问题数量
+//        data1.setproblemLeveTwo 重要问题
+//        data1.setproblemLeveOne 一般问题
+//        data1.setstatisticsTime 统计时间
+
+        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+//        child1.set完整性数量") private Integer problemComplete;
+//        child1.set适宜性数量") private Integer problemSuitable;
+//        child1.set有效性数量") private Integer problemEffective;
+        children1.add(child1);
+        data1.setChildren(children1);
+        list.add(data1);
+
+        CheckedProblemDeptDetaailView data2 = new CheckedProblemDeptDetaailView();
+//        data2.setdeptId 部门ID
+//        data2.setdeptName 部门名称
+//        data2.setproblemTotal 问题数量
+//        data2.setproblemLeveTwo 重要问题
+//        data2.setproblemLeveOne 一般问题
+//        data2.setstatisticsTime 统计时间
+        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child2 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+//        child2.set完整性数量") private Integer problemComplete;
+//        child2.set适宜性数量") private Integer problemSuitable;
+//        child2.set有效性数量") private Integer problemEffective;
+        children1.add(child2);
+        data2.setChildren(children2);
+        list.add(data2);
+
+        CheckedProblemDeptDetaailView data3 = new CheckedProblemDeptDetaailView();
+//        data3.setdeptId 部门ID
+//        data3.setdeptName 部门名称
+//        data3.setproblemTotal 问题数量
+//        data3.setproblemLeveTwo 重要问题
+//        data3.setproblemLeveOne 一般问题
+//        data3.setstatisticsTime 统计时间
+        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child3 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+//        child3.set完整性数量") private Integer problemComplete;
+//        child3.set适宜性数量") private Integer problemSuitable;
+//        child3.set有效性数量") private Integer problemEffective;
+        children1.add(child3);
+        data3.setChildren(children3);
+        list.add(data3);
+
+        CheckedProblemDeptDetaailView data4 = new CheckedProblemDeptDetaailView();
+//        data4.setdeptId 部门ID
+//        data4.setdeptName 部门名称
+//        data4.setproblemTotal 问题数量
+//        data4.setproblemLeveTwo 重要问题
+//        data4.setproblemLeveOne 一般问题
+//        data4.setstatisticsTime 统计时间
+        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child4 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+//        child4.set完整性数量") private Integer problemComplete;
+//        child4.set适宜性数量") private Integer problemSuitable;
+//        child4.set有效性数量") private Integer problemEffective;
+        children1.add(child4);
+        data4.setChildren(children4);
+        list.add(data4);
+        return success(list);
+    }
+}

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

@@ -0,0 +1,259 @@
+package com.ruoyi.postCheck.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.postCheck.domain.problemStatistics.*;
+import com.ruoyi.postCheck.service.IPostCheckedProblemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 岗检问题表Controller
+ *
+ * @author csg
+ * @date 2023-12-23
+ */
+@Api(tags = "5.2.1-统计分析-整改统计-整改统计（职能管理）")
+@RestController
+@RequestMapping("/postCheck/rectificationFunctionProblemStatistics")
+public class PostCheckedRectificationFunctionProblemStatisticsController extends BaseController {
+    @Autowired
+    private IPostCheckedProblemService postCheckedProblemService;
+
+
+    @ApiOperation("1-职能部各部门问题数量对比")
+    @GetMapping("/functionDeptProblemContrast")
+    public AjaxResult functionDeptProblemContrast(FunctionDeptProblemContrastView notParam) { //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);
+        return success(list);
+    }
+
+
+    @ApiOperation("2-岗检覆盖率")
+    @GetMapping("/coverageRateView")
+    public AjaxResult coverageRateView(CoverageRateView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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<CoverageRateView> list = new ArrayList<>();
+        CoverageRateView data = new CoverageRateView();
+        data.setProblemTotal(6);
+        data.setProblemComplete(5);
+
+        list.add(data);
+        return success(list);
+    }
+
+    @ApiOperation("3-岗检问题职责类别占比")
+    @GetMapping("/dutyTypeProblemStatisticsView")
+    public AjaxResult dutyTypeProblemStatisticsView(DutyTypeProblemStatisticsView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        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);
+    }
+
+    @ApiOperation("4-岗检问题级别占比")
+    @GetMapping("/problemLevelView")
+    public AjaxResult problemLevelView(ProblemLevelView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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);
+    }
+
+
+    @ApiOperation("5-岗检问题属性及类别整改占比")
+    @GetMapping("/problemAttributeCategoryView")
+    public AjaxResult problemAttributeCategoryView(ProblemAttributeCategoryView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+
+        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 success(list);
+    }
+
+
+    @ApiOperation("6-历年岗检问题数量")
+    @GetMapping("/historyProblemNumberView")
+    public AjaxResult historyProblemNumberView(HistoryProblemNumberView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        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);
+    }
+
+
+    @ApiOperation("7-部门详情")
+    @GetMapping("/deptDetaailView")
+    public AjaxResult deptDetaailView(DeptDetaailView 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 第一步：得到各个部门ID和部门名称及统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+
+        DeptDetaailView data1 = new DeptDetaailView();
+//        data1.setdeptId 部门ID
+//        data1.setdeptName 部门名称
+//        data1.setproblemRectificationRate 整改率
+//        data1.setstatisticsTime 统计时间
+
+        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
+//        child1.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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.add(data1);
+
+        DeptDetaailView data2 = new DeptDetaailView();
+//        data2.setdeptId 部门ID
+//        data2.setdeptName 部门名称
+//        data2.setproblemRectificationRate 整改率
+//        data2.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
+//        child2.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data2);
+
+        DeptDetaailView data3 = new DeptDetaailView();
+//        data3.setdeptId 部门ID
+//        data3.setdeptName 部门名称
+//        data3.setproblemRectificationRate 整改率
+//        data3.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
+//        child3.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data3);
+
+        DeptDetaailView data4 = new DeptDetaailView();
+//        data4.setdeptId 部门ID
+//        data4.setdeptName 部门名称
+//        data4.setproblemRectificationRate 整改率
+//        data4.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
+//        child4.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data4);
+        return success(list);
+    }
+}

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

@@ -0,0 +1,259 @@
+package com.ruoyi.postCheck.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.postCheck.domain.problemStatistics.*;
+import com.ruoyi.postCheck.service.IPostCheckedProblemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 岗检问题表Controller
+ *
+ * @author csg
+ * @date 2023-12-23
+ */
+@Api(tags = "5.2.2-统计分析-整改统计-整改统计（生产运营）")
+@RestController
+@RequestMapping("/postCheck/rectificationProductionProblemStatistics")
+public class PostCheckedRectificationProductionProblemStatisticsController extends BaseController {
+    @Autowired
+    private IPostCheckedProblemService postCheckedProblemService;
+
+
+    @ApiOperation("1-职能部各部门问题数量对比")
+    @GetMapping("/functionDeptProblemContrast")
+    public AjaxResult functionDeptProblemContrast(FunctionDeptProblemContrastView notParam) { //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);
+        return success(list);
+    }
+
+
+    @ApiOperation("2-岗检覆盖率")
+    @GetMapping("/coverageRateView")
+    public AjaxResult coverageRateView(CoverageRateView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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<CoverageRateView> list = new ArrayList<>();
+        CoverageRateView data = new CoverageRateView();
+        data.setProblemTotal(6);
+        data.setProblemComplete(5);
+
+        list.add(data);
+        return success(list);
+    }
+
+    @ApiOperation("3-岗检问题职责类别占比")
+    @GetMapping("/dutyTypeProblemStatisticsView")
+    public AjaxResult dutyTypeProblemStatisticsView(DutyTypeProblemStatisticsView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        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);
+    }
+
+    @ApiOperation("4-岗检问题级别占比")
+    @GetMapping("/problemLevelView")
+    public AjaxResult problemLevelView(ProblemLevelView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        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);
+    }
+
+
+    @ApiOperation("5-岗检问题属性及类别整改占比")
+    @GetMapping("/problemAttributeCategoryView")
+    public AjaxResult problemAttributeCategoryView(ProblemAttributeCategoryView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
+
+
+        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 success(list);
+    }
+
+
+    @ApiOperation("6-历年岗检问题数量")
+    @GetMapping("/historyProblemNumberView")
+    public AjaxResult historyProblemNumberView(HistoryProblemNumberView notParam) { //notParam不是参数-是返回信息-方便接口联调
+//         查询问题表
+//        select * from "public"."post_checked_problem";
+//        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
+//        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);
+    }
+
+
+    @ApiOperation("7-部门详情")
+    @GetMapping("/deptDetaailView")
+    public AjaxResult deptDetaailView(DeptDetaailView 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 第一步：得到各个部门ID和部门名称及统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+
+        DeptDetaailView data1 = new DeptDetaailView();
+//        data1.setdeptId 部门ID
+//        data1.setdeptName 部门名称
+//        data1.setproblemRectificationRate 整改率
+//        data1.setstatisticsTime 统计时间
+
+        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
+//        child1.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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.add(data1);
+
+        DeptDetaailView data2 = new DeptDetaailView();
+//        data2.setdeptId 部门ID
+//        data2.setdeptName 部门名称
+//        data2.setproblemRectificationRate 整改率
+//        data2.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
+//        child2.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data2);
+
+        DeptDetaailView data3 = new DeptDetaailView();
+//        data3.setdeptId 部门ID
+//        data3.setdeptName 部门名称
+//        data3.setproblemRectificationRate 整改率
+//        data3.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
+//        child3.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data3);
+
+        DeptDetaailView data4 = new DeptDetaailView();
+//        data4.setdeptId 部门ID
+//        data4.setdeptName 部门名称
+//        data4.setproblemRectificationRate 整改率
+//        data4.setstatisticsTime 统计时间
+        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
+        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
+//        child4.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+//        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);
+        list.add(data4);
+        return success(list);
+    }
+}

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

@@ -181,8 +181,8 @@ public class PostListController extends BaseController {
     @ApiOperation("2、检查内容：参数是检查项目下拉框")
     @GetMapping("/contentListByType")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "deptId", value = "参数->部门ID", dataType = "Integer", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "postId", value = "参数->岗位ID", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "deptId", value = "参数->部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "postId", value = "参数->岗位ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "type", value = "参数->检查项目（业务职责、党建党风、安全环保……）", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "postCheckedContent", value = "返回->检查内容", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "postCheckedStandard", value = "返回->检查标准", dataType = "String", dataTypeClass = String.class),
@@ -266,7 +266,6 @@ public class PostListController extends BaseController {
                 item.setPostCheckedStandard("按照要求做好保密教育、不发生重大泄密事件；不发生大规模群访闹访事件，限时办结信访事项->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
                 itemsList.add(item);
 
-
             }
 
             // 按类型

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

@@ -83,7 +83,6 @@ public class PostTeamController extends BaseController {
 
     /**
      * 导出岗检小组列表
-     */
     @ApiOperation("导出岗检小组列表")
     @PreAuthorize("@ss.hasPermi('postCheck:team:export')")
     @Log(title = "岗检小组", businessType = BusinessType.EXPORT)
@@ -93,6 +92,7 @@ public class PostTeamController extends BaseController {
         ExcelUtil<PostTeam> util = new ExcelUtil<PostTeam>(PostTeam.class);
         util.exportExcel(response, list, "岗检小组数据");
     }
+     */
 
     /**
      * 获取岗检小组详细信息

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

@@ -54,16 +54,15 @@ public class PostTeamUserController extends BaseController {
 
     /**
      * 导出岗检小组关联成员列表
+     @ApiOperation("导出岗检小组关联成员列表")
+     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:export')")
+     @Log(title = "岗检小组关联成员", businessType = BusinessType.EXPORT)
+     @PostMapping("/export") public void export(HttpServletResponse response, PostTeamUser postTeamUser) {
+     List<PostTeamUser> list = postTeamUserService.selectPostTeamUserList(postTeamUser);
+     ExcelUtil<PostTeamUser> util = new ExcelUtil<PostTeamUser>(PostTeamUser.class);
+     util.exportExcel(response, list, "岗检小组关联成员数据");
+     }
      */
-    @ApiOperation("导出岗检小组关联成员列表")
-    @PreAuthorize("@ss.hasPermi('postCheck:teamUser:export')")
-    @Log(title = "岗检小组关联成员", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostTeamUser postTeamUser) {
-        List<PostTeamUser> list = postTeamUserService.selectPostTeamUserList(postTeamUser);
-        ExcelUtil<PostTeamUser> util = new ExcelUtil<PostTeamUser>(PostTeamUser.class);
-        util.exportExcel(response, list, "岗检小组关联成员数据");
-    }
 
     /**
      * 获取岗检小组关联成员详细信息
@@ -90,20 +89,21 @@ public class PostTeamUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:add')")
     @Log(title = "岗检小组关联成员", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PostTeamUser postTeamUser) {
-        return toAjax(postTeamUserService.insertPostTeamUser(postTeamUser));
+    public AjaxResult add(@RequestBody List<PostTeamUser> postTeamUserList) {
+        return toAjax(postTeamUserService.insertPostTeamUser(postTeamUserList));
     }
 
     /**
+     * 前端使用使用添加新增，不使用修改，新增接口始终传全量数据
      * 修改岗检小组关联成员
+     *
+     @ApiOperation("修改岗检小组关联成员")
+     @PreAuthorize("@ss.hasPermi('postCheck:teamUser:edit')")
+     @Log(title = "岗检小组关联成员", businessType = BusinessType.UPDATE)
+     @PutMapping public AjaxResult edit(@RequestBody List<PostTeamUser> postTeamUserList) {
+     return toAjax(postTeamUserService.updatePostTeamUser(postTeamUserList));
+     }
      */
-    @ApiOperation("修改岗检小组关联成员")
-    @PreAuthorize("@ss.hasPermi('postCheck:teamUser:edit')")
-    @Log(title = "岗检小组关联成员", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PostTeamUser postTeamUser) {
-        return toAjax(postTeamUserService.updatePostTeamUser(postTeamUser));
-    }
 
     /**
      * 删除岗检小组关联成员

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedProblem.java

@@ -199,11 +199,14 @@ public class PostCheckedProblem extends BaseEntity {
     private Date checkTime;
 
 
-//    ==================显示字段==============
+    //    ==================显示字段==============
     @ApiModelProperty("整改责任部门名称")
     @TableField(exist = false)
     private String checkedDeptName;
     @ApiModelProperty("整改责任岗位名称")
     @TableField(exist = false)
     private String checkedPostName;
+    @ApiModelProperty("整改责任人名称")
+    @TableField(exist = false)
+    private String rectificationResponsibleUserName;
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostTeamUser.java

@@ -40,7 +40,7 @@ public class PostTeamUser extends BaseEntity
     @ApiModelProperty("类型（1-组长；2-成员；）")
     @TableField(value = "type")
     @Excel(name = "类型", readConverterExp = "类型（1-组长；2-成员；）")
-    private Long type;
+    private Integer type;
 
     @ApiModelProperty("创建者用户ID")
     @TableField(value = "create_user_id")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/join/PostPlanJoinChecked.java

@@ -23,12 +23,20 @@ public class PostPlanJoinChecked implements Serializable {
 //    @TableField(value = "check_group_id")
     @Excel(name = "检查工作组ID")
     private Long checkGroupId;
+    @ApiModelProperty("检查工作组名称")
+    private String checkGroupName;
 
     @ApiModelProperty("检查小组")
 //    @TableField(value = "check_team_id")
     @Excel(name = "检查小组")
     private Long checkTeamId;
 
+    @ApiModelProperty("检查小组名称")
+    private String checkTeamName;
+
+    @ApiModelProperty("检查人员中文名称逗号拼接")
+    private String checkedUserNames;
+
     @ApiModelProperty("上传：检查人ID")
 //    @TableField(value = "checked_user_id")
     @Excel(name = "检查人ID")
@@ -38,12 +46,17 @@ public class PostPlanJoinChecked implements Serializable {
 //    @TableField(value = "checked_dept_id")
     @Excel(name = "被检查部门ID")
     private Long checkedDeptId;
+    @ApiModelProperty("被检查部门名称")
+    private String checkedDeptName;
 
     @ApiModelProperty("被检查岗位ID")
 //    @TableField(value = "checked_post_id")
     @Excel(name = "被检查岗位ID")
     private Long checkedPostId;
 
+    @ApiModelProperty("被检查岗位名称（多个拼接）")
+    private String checkedPostNames;
+
     @ApiModelProperty("岗检状态：1-未检；2-已检；")
 //    @TableField(value = "status")
     @Excel(name = "岗检状态")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/join/PostPlanJoinProblem.java

@@ -34,12 +34,12 @@ public class PostPlanJoinProblem implements Serializable {
     @Excel(name = "检查小组")
     private Long checkTeamId;
 
-    @ApiModelProperty("检查人员中文名称逗号拼接")
-    private String checkedUserNames;
-
     @ApiModelProperty("检查小组名称")
     private String checkTeamName;
 
+    @ApiModelProperty("检查人员中文名称逗号拼接")
+    private String checkedUserNames;
+
     @ApiModelProperty("被检查部门ID")
 //    @TableField(value = "checked_dept_id")
     @Excel(name = "被检查部门ID")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/CheckedProblemDeptDetaailView.java

@@ -0,0 +1,99 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-部门详情（职能管理）")
+//extends DutyTypeProblemStatisticsView
+public class CheckedProblemDeptDetaailView extends  ProblemLevelView implements Serializable {
+
+    private static final long serialVersionUID = 5666890687691604123L;
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+
+    @ApiModelProperty("总数量")
+    private Integer problemTotal;
+
+//    @ApiModelProperty("一般")
+//    private Integer problemLeveOne;
+
+//    @ApiModelProperty("重要")
+//    private Integer problemLeveTwo;
+
+
+    @ApiModelProperty("统计时间")
+    private Date statisticsTime;
+
+    @ApiModelProperty("duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+    private List<ProblemAttributeInner> children = new ArrayList<>();
+
+
+    /**
+     * 按业务职责归类存放问题整改的情况
+     */
+//            extends ProblemNumberBase {
+    public static class ProblemAttributeInner implements Serializable {
+
+        private static final long serialVersionUID = 3140695152506065277L;
+
+        @ApiModelProperty("业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+        private Integer dutyType;
+
+
+        @ApiModelProperty("完整性数量")
+        private Integer problemComplete;
+        @ApiModelProperty("适宜性数量")
+        private Integer problemSuitable;
+        @ApiModelProperty("有效性数量")
+        private Integer problemEffective;
+
+        @ApiModelProperty("已完成完整性数量")
+        private Integer problemCompleteChecked;
+        @ApiModelProperty("已完成适宜性数量")
+        private Integer problemSuitableChecked;
+        @ApiModelProperty("已完成有效性数量")
+        private Integer problemEffectiveChecked;
+
+    }
+
+
+/**
+ * 业务职责类型
+ */
+//    public static class ProblemDutyType {
+//        @ApiModelProperty("业务职责字典值：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+//        private Integer dutyType;
+//
+//        @ApiModelProperty("业务职责字典值显示名称（后台可以不设置值，让前端做）：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+//        private Integer dutyView;
+//
+//
+//        /**
+//         * @ApiModelProperty("完整性数量") private Integer problemComplete;
+//         * @ApiModelProperty("适宜性数量") private Integer problemSuitable;
+//         * @ApiModelProperty("有效性数量") private Integer problemEffective;
+//         * @ApiModelProperty("已完成完整性数量") private Integer problemCompleteChecked;
+//         * @ApiModelProperty("已完成适宜性数量") private Integer problemSuitableChecked;
+//         * @ApiModelProperty("已完成有效性数量") private Integer problemEffectiveChecked;
+//         */
+//        @ApiModelProperty("problem_attribute 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）")
+//        private List<DutyTypeProblemStatisticsView.ProblemAttributeInner> children = new ArrayList<>();
+//
+//
+//    }
+
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/CoverageRateView.java

@@ -0,0 +1,25 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-岗检覆盖率（职能管理）")
+public class CoverageRateView implements Serializable {
+
+
+    private static final long serialVersionUID = 84061080800486249L;
+
+    @ApiModelProperty("总数量")
+    private Integer problemTotal;
+
+    @ApiModelProperty("问题整改数")
+    private Integer problemComplete;
+
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/DeptDetaailView.java

@@ -0,0 +1,90 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-检查统计-问题统计（生产运用）-部门详情")
+//extends DutyTypeProblemStatisticsView
+public class DeptDetaailView implements Serializable {
+
+    private static final long serialVersionUID = 5666890687691604123L;
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("整改率")
+    private BigDecimal problemRectificationRate;
+    @ApiModelProperty("统计时间")
+    private Date statisticsTime;
+
+    @ApiModelProperty("duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+    private List<ProblemAttributeInner> children = new ArrayList<>();
+
+
+    /**
+     * 按业务职责归类存放问题整改的情况
+     */
+//            extends ProblemNumberBase {
+    public static class ProblemAttributeInner implements Serializable {
+
+        private static final long serialVersionUID = 3140695152506065277L;
+
+        @ApiModelProperty("业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+        private Integer dutyType;
+
+
+        @ApiModelProperty("完整性数量")
+        private Integer problemComplete;
+        @ApiModelProperty("适宜性数量")
+        private Integer problemSuitable;
+        @ApiModelProperty("有效性数量")
+        private Integer problemEffective;
+
+        @ApiModelProperty("已完成完整性数量")
+        private Integer problemCompleteChecked;
+        @ApiModelProperty("已完成适宜性数量")
+        private Integer problemSuitableChecked;
+        @ApiModelProperty("已完成有效性数量")
+        private Integer problemEffectiveChecked;
+
+    }
+
+
+/**
+ * 业务职责类型
+ */
+//    public static class ProblemDutyType {
+//        @ApiModelProperty("业务职责字典值：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+//        private Integer dutyType;
+//
+//        @ApiModelProperty("业务职责字典值显示名称（后台可以不设置值，让前端做）：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
+//        private Integer dutyView;
+//
+//
+//        /**
+//         * @ApiModelProperty("完整性数量") private Integer problemComplete;
+//         * @ApiModelProperty("适宜性数量") private Integer problemSuitable;
+//         * @ApiModelProperty("有效性数量") private Integer problemEffective;
+//         * @ApiModelProperty("已完成完整性数量") private Integer problemCompleteChecked;
+//         * @ApiModelProperty("已完成适宜性数量") private Integer problemSuitableChecked;
+//         * @ApiModelProperty("已完成有效性数量") private Integer problemEffectiveChecked;
+//         */
+//        @ApiModelProperty("problem_attribute 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）")
+//        private List<DutyTypeProblemStatisticsView.ProblemAttributeInner> children = new ArrayList<>();
+//
+//
+//    }
+
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/DutyTypeProblemStatisticsView.java

@@ -0,0 +1,54 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-岗检问题职责类别占比（职能管理）")
+public class DutyTypeProblemStatisticsView implements Serializable {
+
+
+    private static final long serialVersionUID = -6982314157222524166L;
+    @ApiModelProperty("业务职责")
+    private Integer dutyTypeOne;
+
+    @ApiModelProperty("党建及党风廉政")
+    private Integer dutyTypeTwo;
+
+    @ApiModelProperty("安全环保职责")
+    private Integer dutyTypeThree;
+
+    @ApiModelProperty("合规保密职")
+    private Integer dutyTypeFour;
+
+    /**
+     * @ApiModelProperty("完整性数量") private Integer problemComplete;
+     * @ApiModelProperty("适宜性数量") private Integer problemSuitable;
+     * @ApiModelProperty("有效性数量") private Integer problemEffective;
+     * @ApiModelProperty("已完成完整性数量") private Integer problemCompleteChecked;
+     * @ApiModelProperty("已完成适宜性数量") private Integer problemSuitableChecked;
+     * @ApiModelProperty("已完成有效性数量") private Integer problemEffectiveChecked;
+     */
+    @ApiModelProperty("problem_attribute 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）")
+    private List<ProblemAttributeInner> children = new ArrayList<>();
+
+    public static class ProblemAttributeInner extends ProblemNumberBase {
+
+        private static final long serialVersionUID = -5709957331615760177L;
+        @ApiModelProperty("已完成完整性数量")
+        private Integer problemCompleteChecked;
+        @ApiModelProperty("已完成适宜性数量")
+        private Integer problemSuitableChecked;
+        @ApiModelProperty("已完成有效性数量")
+        private Integer problemEffectiveChecked;
+
+    }
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/FunctionDeptProblemContrastView.java

@@ -0,0 +1,25 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-职能部各部门问题数量对比（职能管理）")
+public class FunctionDeptProblemContrastView extends ProblemNumberBase{
+
+
+    private static final long serialVersionUID = -757039503238827630L;
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/HistoryProblemNumberView.java

@@ -0,0 +1,19 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-历年岗检问题数量（职能管理）")
+public class HistoryProblemNumberView extends ProblemNumberBase{
+
+
+    private static final long serialVersionUID = -7993733278042449361L;
+    @ApiModelProperty("年份")
+    private Date checkYear;
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/ProblemAttributeCategoryView.java

@@ -0,0 +1,15 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-岗检问题属性及类别整改占比（职能管理）")
+public class ProblemAttributeCategoryView extends ProblemNumberBase {
+    private static final long serialVersionUID = -5776997032261242866L;
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/ProblemLevelView.java

@@ -0,0 +1,29 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-岗检问题职责类别占比（职能管理）")
+public class ProblemLevelView implements Serializable {
+
+
+    private static final long serialVersionUID = -6982314157222524166L;
+
+    @ApiModelProperty("一般")
+    private Integer problemLeveOne;
+
+    @ApiModelProperty("重要")
+    private Integer problemLeveTwo;
+
+
+
+
+
+}

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/ProblemNumberBase.java

@@ -0,0 +1,46 @@
+package com.ruoyi.postCheck.domain.problemStatistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "统计分析-问题属性&问题类别")
+public class ProblemNumberBase implements Serializable {
+
+    private static final long serialVersionUID = 796035754641326823L;
+
+
+    @ApiModelProperty("总数量")
+    private Integer problemTotal;
+
+
+    @ApiModelProperty("完整性数量")
+    private Integer problemComplete;
+    @ApiModelProperty("适宜性数量")
+    private Integer problemSuitable;
+    @ApiModelProperty("有效性数量")
+    private Integer problemEffective;
+
+
+    @ApiModelProperty("职责权限问题")
+    private Integer problemCategoryOne;
+    @ApiModelProperty("工作内容问题")
+    private Integer problemCategoryTwo;
+    @ApiModelProperty("工作标准问题")
+    private Integer problemCategoryThree;
+    @ApiModelProperty("考核奖励问题")
+    private Integer problemCategoryFour;
+    @ApiModelProperty("任职资格问题")
+    private Integer problemCategoryFive;
+    @ApiModelProperty("其他")
+    private Integer problemCategorySix;
+
+//==================================================
+
+
+}

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/PostAssessmentRatingOtherMapper.java

@@ -69,6 +69,6 @@ public interface PostAssessmentRatingOtherMapper extends BaseMapper<PostAssessme
 
     List<Long> getDeptIdList(Long id);
 
-    List<Map<String,String>> getDeptIdListByType(Integer type);
+    List<Map<String,Object>> getDeptIdListByType(Integer type);
 
 }

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/mapper/PostListMapper.java

@@ -6,6 +6,7 @@ import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostList;
 import com.ruoyi.postCheck.domain.PostListInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -89,4 +90,10 @@ public interface PostListMapper extends BaseMapper<PostList> {
     public int deletePostListInfoByPostListId(Long id);
 
     List<PostCheckedItems> contentListByType(@Param("deptId")Long deptId, @Param("postId")Long postId, @Param("type")Integer type);
+
+    Integer userTotal();
+
+    List<PostCheckedUnCheckedView> postChecked(Integer status);
+
+    Integer getPostCountByDeptId(Long deptId);
 }

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

@@ -1,14 +1,21 @@
 package com.ruoyi.postCheck.service;
 
+import java.math.BigDecimal;
 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.tools.ProblemCategory;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -154,4 +161,22 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
 
 
     PostTotalView totalView();
+
+    PostCheckedProblemView checkedProblem();
+
+    Integer userTotal();
+
+    Map<Integer, BigDecimal> problemRectification();
+
+    List<DeptProblemRectificationView>  deptProblemRectification();
+
+    List<PostCheckedUnCheckedView> postChecked(Integer i);
+
+    Integer getPostCountByDeptId(Long deptId);
+
+    /**
+     * 按问题属性分组统计问题类别
+     * @return
+     */
+    List<ProblemCategory> problemCategoryByAttribute();
 }

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

@@ -31,18 +31,18 @@ public interface IPostTeamUserService extends IService<PostTeamUser>
     /**
      * 新增岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
-    public int insertPostTeamUser(PostTeamUser postTeamUser);
+    public int insertPostTeamUser(List<PostTeamUser> postTeamUserList);
 
     /**
      * 修改岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
+    public int updatePostTeamUser(List<PostTeamUser> postTeamUserList);
      */
-    public int updatePostTeamUser(PostTeamUser postTeamUser);
 
     /**
      * 批量删除岗检小组关联成员

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

@@ -1,7 +1,9 @@
 package com.ruoyi.postCheck.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,11 +79,11 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
             type = 2;
         }
         List<PostAssessmentRating> postAssessmentRatings = new ArrayList<>();
-        List<Map<String, String>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(postAssessmentRating.getType());
+        List<Map<String, Object>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(postAssessmentRating.getType());
         List<PostAssessmentRules> postAssessmentRules = postAssessmentRulesMapper.selectList(Wrappers.lambdaQuery());
-        for (Map<String, String> map : deptIdListByType) {
+        for (Map<String, Object> map : deptIdListByType) {
             PostAssessmentRating post = new PostAssessmentRating();
-            post.setDeptId(Long.parseLong(map.get("deptId")));
+            post.setDeptId(Long.parseLong(map.get("deptId").toString()));
             post.setDeptIdStr(String.valueOf(map.get("deptName")));
             // 计算一个部门的岗检得分
             // 1 先查询问题
@@ -98,14 +100,17 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
                     Optional<PostAssessmentRules> first = postAssessmentRules.stream().filter(d ->d.getType() == type && d.getDutyType().equals(postCheckedProblem.getDutyType())).findFirst();
                     if (first.isPresent()){
                         if (postCheckedProblem.getProblemLevel().equals("1")){
-                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelOne())));
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelOne()!=null?first.get().getProblemLevelOne():"0")));
                         }else{
-                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo())));
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo()!=null?first.get().getProblemLevelTwo():"0")));
                         }
                     }
                 }
+                BigDecimal divide = new BigDecimal("0");
+                if (postTotal != null){
+                    divide =  new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())),4, RoundingMode.HALF_UP);
+                }
                 // 计算系数 1-问题总数/需要查的问题数
-                BigDecimal divide = new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())));
                 if (divide.compareTo(new BigDecimal("1")) < 0 && divide.compareTo(new BigDecimal("0")) > 0 ){
                     postSouce = postAfter.multiply(new BigDecimal("1").subtract(divide));
                 }else{
@@ -119,7 +124,7 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
 
             List<PostAssessmentRatingOtherInfo> postAssessmentRatingOtherInfos = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
                     .eq(PostAssessmentRatingOtherInfo::getByDeptId,post.getDeptId())
-                    .apply("and \"rating_other_id\" in (SELECT \"id\" FROM \"public\".\"post_assessment_rating_other\" WHERE \"type\"  = 1\n)")
+                    .apply(" \"rating_other_id\" in (SELECT \"id\" FROM \"public\".\"post_assessment_rating_other\" WHERE \"type\"  = 1\n)")
                     .orderByAsc(PostAssessmentRatingOtherInfo::getByDeptScore)
             );
             BigDecimal peerEvaluationScore = new BigDecimal("100");
@@ -128,17 +133,18 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
                 postAssessmentRatingOtherInfos.remove(0);
                 BigDecimal sum = new BigDecimal("0");
                 postAssessmentRatingOtherInfos.forEach(x -> {
-                    sum.add(x.getByDeptScore());
+                    sum.add(x.getByDeptScore()!=null?x.getByDeptScore():new BigDecimal("0"));
                 });
-                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()));
+                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()),4, RoundingMode.HALF_UP);
             }
             post.setPeerEvaluationScore(peerEvaluationScore);
             postAssessmentRatings.add(post);
             // 计算总得分
             post.setDepartmentScore(post.getPositionScore().add(post.getPeerEvaluationScore()).divide(new BigDecimal("2")));
         }
+        List<PostAssessmentRating> collect = postAssessmentRatings.stream().sorted(Comparator.comparing(PostAssessmentRating::getDepartmentScore).reversed()).collect(Collectors.toList());
         // 计算  岗检得分
-        return postAssessmentRatings;
+        return collect;
     }
 
     /**

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

@@ -2,9 +2,14 @@ package com.ruoyi.postCheck.service.impl;
 
 import java.awt.dnd.DropTarget;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,14 +21,20 @@ import com.ruoyi.postCheck.domain.PostAssessmentRules;
 import com.ruoyi.postCheck.domain.PostList;
 import com.ruoyi.postCheck.domain.PostPlan;
 import com.ruoyi.postCheck.domain.PostPlanInfo;
+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.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 +47,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 
-
-
-
-
-
-
-
-
 /**
  * 岗检问题表Service业务层处理
  *
@@ -157,7 +160,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 +176,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 +505,190 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         postTotalView.setUncheckedPostCount(uncheckedPostCount);
         return postTotalView;
     }
+
+    @Override
+    public PostCheckedProblemView checkedProblem() {
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        Integer problemComplete = 0;
+        Integer problemSuitable = 0;
+        Integer problemEffective = 0;
+        //（1-完整问题；2-有效性问题；3-适宜性问题；）
+        if (!postCheckedProblems.isEmpty())
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 1)
+                    problemComplete++;
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 3)
+                    problemEffective++;
+                if (postCheckedProblem.getProblemAttribute()!=null && postCheckedProblem.getProblemAttribute() == 2)
+                    problemSuitable++;
+            }
+        PostCheckedProblemView post = new PostCheckedProblemView();
+        post.setProblemTotal(postCheckedProblems.size());
+        post.setProblemComplete(problemComplete);
+        post.setProblemSuitable(problemSuitable);
+        post.setProblemEffective(problemEffective);
+        return post;
+    }
+
+    @Override
+    public Integer userTotal() {
+        return postListMapper.userTotal();
+    }
+
+    @Override
+    public Map<Integer, BigDecimal> problemRectification() {
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        Integer problemComplete = 0;
+        Integer overproblemComplete = 0;
+        Integer problemSuitable = 0;
+        Integer overproblemSuitable = 0;
+        Integer problemEffective = 0;
+        Integer overproblemEffective = 0;
+        Integer total = 0;
+        Integer overtotal = 0;
+        //（1-完整问题；2-有效性问题；3-适宜性问题；4 总数）
+        if (!postCheckedProblems.isEmpty())
+            for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 1) {
+                    problemComplete++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemComplete++;
+                    }
+                }
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 3) {
+                    problemEffective++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemEffective++;
+                    }
+                }
+                if (postCheckedProblem.getProblemAttribute()!=null&&postCheckedProblem.getProblemAttribute() == 2) {
+                    problemSuitable++;
+                    if (postCheckedProblem.getIsImmediatelyCorrected()!=null&&postCheckedProblem.getIsImmediatelyCorrected() == 1) {
+                        overproblemSuitable++;
+                    }
+                }
+                total++;
+                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));
+        return map;
+
+    }
+
+    @Override
+    public List<DeptProblemRectificationView> deptProblemRectification() {
+        List<DeptProblemRectificationView> dataList = new ArrayList<>();
+        List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.lambdaQuery());
+        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();
+                data1.setDeptId(entry.getKey());
+                data1.setDeptName(postAssessmentRatingMapper.getSysDeptName(entry.getKey()));
+                Integer problemTotal = 0;
+                Integer problemComplete = 0;
+                for (PostCheckedProblem postCheckedProblem : entry.getValue()) {
+                    problemTotal++;
+                    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));
+                dataList.add(data1);
+            }
+        }
+        return dataList;
+    }
+
+    @Override
+    public List<PostCheckedUnCheckedView> postChecked(Integer i) {
+        return postListMapper.postChecked(i);
+    }
+
+    @Override
+    public Integer getPostCountByDeptId(Long deptId) {
+        return postListMapper.getPostCountByDeptId(deptId);
+    }
+
+    /**
+     * 按问题属性分组统计问题类别
+     *
+     * @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/java/com/ruoyi/postCheck/service/impl/PostCheckedServiceImpl.java

@@ -107,6 +107,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
         if (row > 0) {
             for (PostCheckedItems child : children) {
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
             }
             postCheckedItemsService.saveBatch(children);
@@ -147,6 +148,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
             //插入明细
             for (PostCheckedItems child : children) {
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
             }
             postCheckedItemsService.saveBatch(children);

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

@@ -1,8 +1,12 @@
 package com.ruoyi.postCheck.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,6 +14,7 @@ import com.ruoyi.postCheck.mapper.PostTeamUserMapper;
 import com.ruoyi.postCheck.domain.PostTeamUser;
 import com.ruoyi.postCheck.service.IPostTeamUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 岗检小组关联成员Service业务层处理
@@ -18,8 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2023-12-19
  */
 @Service
-public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, PostTeamUser> implements IPostTeamUserService
-{
+public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, PostTeamUser> implements IPostTeamUserService {
     @Autowired
     private PostTeamUserMapper postTeamUserMapper;
 
@@ -30,8 +34,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 岗检小组关联成员
      */
     @Override
-    public PostTeamUser selectPostTeamUserById(Long id)
-    {
+    public PostTeamUser selectPostTeamUserById(Long id) {
         return postTeamUserMapper.selectPostTeamUserById(id);
     }
 
@@ -42,40 +45,104 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 岗检小组关联成员
      */
     @Override
-    public List<PostTeamUser> selectPostTeamUserList(PostTeamUser postTeamUser)
-    {
+    public List<PostTeamUser> selectPostTeamUserList(PostTeamUser postTeamUser) {
         return postTeamUserMapper.selectPostTeamUserList(postTeamUser);
     }
 
     /**
      * 新增岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
     @Override
-    public int insertPostTeamUser(PostTeamUser postTeamUser)
-    {
-        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-        if (postTeamUser.getId() == null)
+    public int insertPostTeamUser(List<PostTeamUser> postTeamUserList) {
+        if (CollectionUtils.isEmpty(postTeamUserList)) {
+            return 0;
+        }
+
+        List<Long> postTeamIdList = postTeamUserList.stream().map(t -> t.getPostTeamId()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(postTeamIdList)) {
+            throw new BaseException("postTeamId为空，请检查！");
+        }
+
+        //删除原来的用户
+        LambdaQueryWrapper<PostTeamUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(PostTeamUser::getPostTeamId, postTeamIdList);
+        postTeamUserMapper.delete(wrapper);
+
+        //新增用户
+        int count = 0;
+        int index = 0;
+        for (PostTeamUser postTeamUser : postTeamUserList) {
+            //类型（1-组长；2-成员；）
+            if (index++ == 0) {
+                postTeamUser.setType(1);
+            } else {
+                postTeamUser.setType(2);
+            }
+            Long postTeamId = postTeamUser.getPostTeamId();
+            if (postTeamId == null) {
+                throw new BaseException("postTeamId为空，请检查！");
+            }
+
+            //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postTeamUser.getId() == null)
             postTeamUser.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-        postTeamUser.setCreateDefault();
-        return postTeamUserMapper.insertPostTeamUser(postTeamUser);
+            postTeamUser.setCreateDefault();
+            count += postTeamUserMapper.insertPostTeamUser(postTeamUser);
+        }
+        return count;
     }
 
     /**
      * 修改岗检小组关联成员
      *
-     * @param postTeamUser 岗检小组关联成员
+     * @param postTeamUserList 岗检小组关联成员数组
      * @return 结果
      */
-    @Override
-    public int updatePostTeamUser(PostTeamUser postTeamUser)
-    {
-        postTeamUser.setUpdateDefault();
-        return postTeamUserMapper.updatePostTeamUser(postTeamUser);
-    }
+  /*  @Override
+    public int updatePostTeamUser(List<PostTeamUser> postTeamUserList) {
+        if (CollectionUtils.isEmpty(postTeamUserList)) {
+            return 0;
+        }
+
+        List<Long> postTeamIdList = postTeamUserList.stream().map(t -> t.getPostTeamId()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(postTeamIdList)) {
+            throw new BaseException("postTeamId为空，请检查！");
+        }
+        //删除原来的用户
+        LambdaQueryWrapper<PostTeamUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(PostTeamUser::getPostTeamId, postTeamIdList);
+        postTeamUserMapper.delete(wrapper);
+
+        //新增用户
+        int count = 0;
+        int index = 0;
+        for (PostTeamUser postTeamUser : postTeamUserList) {
+            //类型（1-组长；2-成员；）
+            if (index++ == 0) {
+                postTeamUser.setType(1);
+            } else {
+                postTeamUser.setType(2);
+            }
 
+            Long postTeamId = postTeamUser.getPostTeamId();
+            if (postTeamId == null) {
+                throw new BaseException("postTeamId为空，请检查！");
+            }
+            //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postTeamUser.getId() == null)
+            postTeamUser.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            postTeamUser.setCreateDefault();
+            count += postTeamUserMapper.insertPostTeamUser(postTeamUser);
+        }
+        return count;
+
+//        postTeamUser.setUpdateDefault();
+//        return postTeamUserMapper.updatePostTeamUser(postTeamUser);
+    }
+*/
     /**
      * 批量删除岗检小组关联成员
      *
@@ -83,8 +150,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 结果
      */
     @Override
-    public int deletePostTeamUserByIds(Long[] ids)
-    {
+    public int deletePostTeamUserByIds(Long[] ids) {
         return postTeamUserMapper.deletePostTeamUserByIds(ids);
     }
 
@@ -95,8 +161,7 @@ public class PostTeamUserServiceImpl extends ServiceImpl<PostTeamUserMapper, Pos
      * @return 结果
      */
     @Override
-    public int deletePostTeamUserById(Long id)
-    {
+    public int deletePostTeamUserById(Long id) {
         return postTeamUserMapper.deletePostTeamUserById(id);
     }
 }

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

@@ -178,6 +178,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getDeptIdListByType" resultType="java.util.Map">
-        SELECT "dept_id" as deptId,"dept_name" as deptName FROM "public"."sys_dept" where "type" = #{type};
+        SELECT "dept_id" as deptId,"dept_name" as deptName FROM "public"."sys_dept" where "type" = #{type} group by "dept_id","dept_name"
     </select>
 </mapper>

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>

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

@@ -265,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="contentListByType" resultType="PostCheckedItems">
         SELECT
+            t2.id,
             t2.type,
             t2.level_one  as levelOne,
             t2.level_two as levelTwo,
@@ -293,4 +294,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND t1."post_id" = #{postId}
         AND t2."type" = #{type}
     </select>
+
+    <select id="userTotal" resultType="java.lang.Integer">
+        SELECT count(0) FROM "public"."sys_users"
+    </select>
+
+    <select id="postChecked" resultType="com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView">
+        SELECT
+            t2."checked_dept_id" deptId ,
+            t2.checked_post_id postId,
+            (select a."post_name" from "public"."sys_post" a WHERE a."post_id" = t2.checked_post_id) AS postName,
+            (select aa."dept_name" from "public"."sys_dept" aa WHERE aa."dept_id" = t2.checked_dept_id) AS deptName,
+            (select count(0) from "public"."sys_user_post" a LEFT JOIN "public"."sys_users" b ON a."user_id" = b."user_id" WHERE a."post_id" = t2."checked_post_id") AS "userCount"
+        FROM "post_plan" t1
+                 INNER JOIN "post_plan_info" t2 ON t2."post_plan_id" = t1."id"
+        WHERE t1.status = 3 -- 状态：1-待审核；2-审核中；3-通过；4-驳回；
+          AND t2."status" = #{status} -- 岗检状态：1-未检；2-已检；
+        GROUP BY t2."checked_dept_id", t2."checked_post_id"
+        ORDER BY t2."checked_dept_id"
+    </select>
+
+    <select id="getPostCountByDeptId" resultType="java.lang.Integer">
+        SELECT COUNT(0) FROM "public"."sys_user_post" sup LEFT JOIN "public"."sys_user_role" sur ON sup."user_id" = sur."user_id"
+                                                          LEFT JOIN "public"."sys_role_dept" srd ON sur."role_id" = srd."role_id"
+        WHERE srd."dept_id" = #{deptId}
+    </select>
 </mapper>

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

@@ -199,6 +199,7 @@
 
     <!--从岗检计划中查询，岗检记录上传的列表-->
     <select id="selectPostPlanJoinCheckedList" parameterType="PostPlanJoinChecked" resultType="PostPlanJoinChecked">
+       <!--
         SELECT
             t1.check_group_id AS checkGroupId,
             t1.check_team_id AS checkTeamId,
@@ -211,6 +212,30 @@
         INNER JOIN post_plan_info t2 ON t2."post_plan_id"  = t1.id
         GROUP BY t2.checked_dept_id
         ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id
+        -->
+        SELECT
+            t1.check_group_id AS checkGroupId,
+            t1.check_team_id AS checkTeamId,
+            t2.id AS planInfoId,
+            t2.checked_user_id AS checkedUserId,
+            t2.checked_dept_id AS checkedDeptId,
+            t2.checked_post_id AS checkedPostId,
+            t2.status AS status,
+            pt1.name AS checkGroupName,
+            pt2.name AS checkTeamName,
+            sd.dept_name AS checkedDeptName,
+            GROUP_CONCAT (DISTINCT sp.post_name) AS checkedPostNames,
+            GROUP_CONCAT (DISTINCT su."nick_name") AS checkedUserNames
+        FROM post_plan t1
+        INNER JOIN post_plan_info t2 ON t2."post_plan_id"  = t1.id
+        LEFT JOIN post_plan_check_user t3 ON t3.post_plan_id  = t1.id
+        LEFT JOIN "public"."sys_users" su ON su."user_id" = t3."checked_user_id"
+        LEFT JOIN post_team pt1 ON pt1.id = t1.check_group_id
+        LEFT JOIN post_team pt2 ON pt2.id = t1.check_team_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = t2.checked_dept_id
+        LEFT JOIN sys_post sp ON sp.post_id = t2.checked_post_id
+        GROUP BY t2.checked_dept_id
+        ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id
     </select>
 
     <!--从岗检计划中查询，岗检问题录入的列表-->

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

@@ -29,11 +29,65 @@
         <result property="statusUserId"    column="status_user_id"    />
         <result property="statusIcfaUserId"    column="status_icfa_user_id"    />
         <result property="statusHrUserId"    column="status_hr_user_id"    />
-        <result property="step" column="step" />
     </resultMap>
 
     <sql id="selectPostProgrammeVo">
-        select id, name, submit_date, status_hr, date_hr, reason_hr, status_icfa, date_icfa, reason_icfa, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id, disk_path, dept_id, dept_name, status, status_time, status_user_id, status_icfa_user_id, status_hr_user_id, step from post_programme
+        <!--
+        select
+            id,
+            name,
+            submit_date,
+            status_hr,
+            date_hr,
+            reason_hr,
+            status_icfa,
+            date_icfa,
+            reason_icfa,
+            remark,
+            del_flag,
+            create_time,
+            create_by,
+            update_time,
+            update_by,
+            create_user_id,
+            disk_path,
+            dept_id,
+            dept_name,
+            status,
+            status_time,
+            status_user_id,
+            status_icfa_user_id,
+            status_hr_user_id,
+            step
+        from post_programme
+        -->
+        select
+            t1.id,
+            t1.name,
+            t1.submit_date,
+            t1.status_hr,
+            t1.date_hr,
+            t1.reason_hr,
+            t1.status_icfa,
+            t1.date_icfa,
+            t1.reason_icfa,
+            t1.remark,
+            t1.del_flag,
+            t1.create_time,
+            t1.create_by,
+            t1.update_time,
+            t1.update_by,
+            t1.create_user_id,
+            t1.disk_path,
+            t1.dept_id,
+            t1.dept_name,
+            t1.status,
+            t1.status_time,
+            t1.status_user_id,
+            t1.status_icfa_user_id,
+            t1.status_hr_user_id,
+            step
+        from post_programme t1
     </sql>
 
     <select id="selectPostProgrammeList" parameterType="PostProgramme" resultMap="PostProgrammeResult">