Merge remote-tracking branch 'origin/master'

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

@@ -60,6 +60,36 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
         data.setProblemCategorySix(1);
 
         list.add(data);
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
+        data1.setDeptId(101l);
+        data1.setDeptName("测试部门2");
+//        data1.setProblemTotal(6);
+//        data1.setProblemComplete(1);
+//        data1.setProblemSuitable(2);
+        data1.setProblemEffective(3);
+        data1.setProblemCategoryOne(1);
+        data1.setProblemCategoryTwo(1);
+        data1.setProblemCategoryThree(2);
+        data1.setProblemCategoryFour(1);
+        data1.setProblemCategoryFive(4);
+        data1.setProblemCategorySix(1);
+        list.add(data1);
+
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
+        data2.setDeptId(102l);
+        data2.setDeptName("测试部门3");
+        data2.setProblemTotal(6);
+        data2.setProblemComplete(1);
+//        data2.setProblemSuitable(2);
+        data2.setProblemEffective(3);
+
+        data2.setProblemCategoryOne(1);
+//        data2.setProblemCategoryTwo(1);
+        data2.setProblemCategoryThree(1);
+//        data2.setProblemCategoryFour(1);
+        data2.setProblemCategoryFive(1);
+        data2.setProblemCategorySix(4);
+        list.add(data2);
         return success(list);
     }
 

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

@@ -52,8 +52,41 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
         data.setProblemCategoryFour(1);
         data.setProblemCategoryFive(1);
         data.setProblemCategorySix(1);
-
         list.add(data);
+
+
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
+        data1.setDeptId(101l);
+        data1.setDeptName("测试部门2");
+//        data1.setProblemTotal(6);
+//        data1.setProblemComplete(1);
+//        data1.setProblemSuitable(2);
+        data1.setProblemEffective(3);
+        data1.setProblemCategoryOne(1);
+        data1.setProblemCategoryTwo(1);
+        data1.setProblemCategoryThree(2);
+        data1.setProblemCategoryFour(1);
+        data1.setProblemCategoryFive(4);
+        data1.setProblemCategorySix(1);
+        list.add(data1);
+
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
+        data2.setDeptId(102l);
+        data2.setDeptName("测试部门3");
+        data2.setProblemTotal(6);
+        data2.setProblemComplete(1);
+//        data2.setProblemSuitable(2);
+        data2.setProblemEffective(3);
+
+        data2.setProblemCategoryOne(1);
+//        data2.setProblemCategoryTwo(1);
+        data2.setProblemCategoryThree(1);
+//        data2.setProblemCategoryFour(1);
+        data2.setProblemCategoryFive(1);
+        data2.setProblemCategorySix(4);
+        list.add(data2);
+
+
         return success(list);
     }
 

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

@@ -54,6 +54,37 @@ public class PostCheckedRectificationFunctionProblemStatisticsController extends
         data.setProblemCategorySix(1);
 
         list.add(data);
+
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
+        data1.setDeptId(101l);
+        data1.setDeptName("测试部门2");
+//        data1.setProblemTotal(6);
+//        data1.setProblemComplete(1);
+//        data1.setProblemSuitable(2);
+        data1.setProblemEffective(3);
+        data1.setProblemCategoryOne(1);
+        data1.setProblemCategoryTwo(1);
+        data1.setProblemCategoryThree(2);
+        data1.setProblemCategoryFour(1);
+        data1.setProblemCategoryFive(4);
+        data1.setProblemCategorySix(1);
+        list.add(data1);
+
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
+        data2.setDeptId(102l);
+        data2.setDeptName("测试部门3");
+        data2.setProblemTotal(6);
+        data2.setProblemComplete(1);
+//        data2.setProblemSuitable(2);
+        data2.setProblemEffective(3);
+
+        data2.setProblemCategoryOne(1);
+//        data2.setProblemCategoryTwo(1);
+        data2.setProblemCategoryThree(1);
+//        data2.setProblemCategoryFour(1);
+        data2.setProblemCategoryFive(1);
+        data2.setProblemCategorySix(4);
+        list.add(data2);
         return success(list);
     }
 

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

@@ -54,6 +54,37 @@ public class PostCheckedRectificationProductionProblemStatisticsController exten
         data.setProblemCategorySix(1);
 
         list.add(data);
+
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
+        data1.setDeptId(101l);
+        data1.setDeptName("测试部门2");
+//        data1.setProblemTotal(6);
+//        data1.setProblemComplete(1);
+//        data1.setProblemSuitable(2);
+        data1.setProblemEffective(3);
+        data1.setProblemCategoryOne(1);
+        data1.setProblemCategoryTwo(1);
+        data1.setProblemCategoryThree(2);
+        data1.setProblemCategoryFour(1);
+        data1.setProblemCategoryFive(4);
+        data1.setProblemCategorySix(1);
+        list.add(data1);
+
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
+        data2.setDeptId(102l);
+        data2.setDeptName("测试部门3");
+        data2.setProblemTotal(6);
+        data2.setProblemComplete(1);
+//        data2.setProblemSuitable(2);
+        data2.setProblemEffective(3);
+
+        data2.setProblemCategoryOne(1);
+//        data2.setProblemCategoryTwo(1);
+        data2.setProblemCategoryThree(1);
+//        data2.setProblemCategoryFour(1);
+        data2.setProblemCategoryFive(1);
+        data2.setProblemCategorySix(4);
+        list.add(data2);
         return success(list);
     }
 

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

@@ -16,29 +16,29 @@ public class ProblemNumberBase implements Serializable {
 
 
     @ApiModelProperty("总数量")
-    private Integer problemTotal;
+    private int problemTotal;
 
 
     @ApiModelProperty("完整性数量")
-    private Integer problemComplete;
+    private int problemComplete;
     @ApiModelProperty("适宜性数量")
-    private Integer problemSuitable;
+    private int problemSuitable;
     @ApiModelProperty("有效性数量")
-    private Integer problemEffective;
+    private int problemEffective;
 
 
     @ApiModelProperty("职责权限问题")
-    private Integer problemCategoryOne;
+    private int problemCategoryOne;
     @ApiModelProperty("工作内容问题")
-    private Integer problemCategoryTwo;
+    private int problemCategoryTwo;
     @ApiModelProperty("工作标准问题")
-    private Integer problemCategoryThree;
+    private int problemCategoryThree;
     @ApiModelProperty("考核奖励问题")
-    private Integer problemCategoryFour;
+    private int problemCategoryFour;
     @ApiModelProperty("任职资格问题")
-    private Integer problemCategoryFive;
+    private int problemCategoryFive;
     @ApiModelProperty("其他")
-    private Integer problemCategorySix;
+    private int problemCategorySix;
 
 //==================================================