Browse Source

Merge remote-tracking branch 'origin/master'

zwj 10 months ago
parent
commit
527ee3a10c

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

@@ -60,6 +60,36 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
60 60
         data.setProblemCategorySix(1);
61 61
 
62 62
         list.add(data);
63
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
64
+        data1.setDeptId(101l);
65
+        data1.setDeptName("测试部门2");
66
+//        data1.setProblemTotal(6);
67
+//        data1.setProblemComplete(1);
68
+//        data1.setProblemSuitable(2);
69
+        data1.setProblemEffective(3);
70
+        data1.setProblemCategoryOne(1);
71
+        data1.setProblemCategoryTwo(1);
72
+        data1.setProblemCategoryThree(2);
73
+        data1.setProblemCategoryFour(1);
74
+        data1.setProblemCategoryFive(4);
75
+        data1.setProblemCategorySix(1);
76
+        list.add(data1);
77
+
78
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
79
+        data2.setDeptId(102l);
80
+        data2.setDeptName("测试部门3");
81
+        data2.setProblemTotal(6);
82
+        data2.setProblemComplete(1);
83
+//        data2.setProblemSuitable(2);
84
+        data2.setProblemEffective(3);
85
+
86
+        data2.setProblemCategoryOne(1);
87
+//        data2.setProblemCategoryTwo(1);
88
+        data2.setProblemCategoryThree(1);
89
+//        data2.setProblemCategoryFour(1);
90
+        data2.setProblemCategoryFive(1);
91
+        data2.setProblemCategorySix(4);
92
+        list.add(data2);
63 93
         return success(list);
64 94
     }
65 95
 

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

@@ -52,8 +52,41 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
52 52
         data.setProblemCategoryFour(1);
53 53
         data.setProblemCategoryFive(1);
54 54
         data.setProblemCategorySix(1);
55
-
56 55
         list.add(data);
56
+
57
+
58
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
59
+        data1.setDeptId(101l);
60
+        data1.setDeptName("测试部门2");
61
+//        data1.setProblemTotal(6);
62
+//        data1.setProblemComplete(1);
63
+//        data1.setProblemSuitable(2);
64
+        data1.setProblemEffective(3);
65
+        data1.setProblemCategoryOne(1);
66
+        data1.setProblemCategoryTwo(1);
67
+        data1.setProblemCategoryThree(2);
68
+        data1.setProblemCategoryFour(1);
69
+        data1.setProblemCategoryFive(4);
70
+        data1.setProblemCategorySix(1);
71
+        list.add(data1);
72
+
73
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
74
+        data2.setDeptId(102l);
75
+        data2.setDeptName("测试部门3");
76
+        data2.setProblemTotal(6);
77
+        data2.setProblemComplete(1);
78
+//        data2.setProblemSuitable(2);
79
+        data2.setProblemEffective(3);
80
+
81
+        data2.setProblemCategoryOne(1);
82
+//        data2.setProblemCategoryTwo(1);
83
+        data2.setProblemCategoryThree(1);
84
+//        data2.setProblemCategoryFour(1);
85
+        data2.setProblemCategoryFive(1);
86
+        data2.setProblemCategorySix(4);
87
+        list.add(data2);
88
+
89
+
57 90
         return success(list);
58 91
     }
59 92
 

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

@@ -54,6 +54,37 @@ public class PostCheckedRectificationFunctionProblemStatisticsController extends
54 54
         data.setProblemCategorySix(1);
55 55
 
56 56
         list.add(data);
57
+
58
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
59
+        data1.setDeptId(101l);
60
+        data1.setDeptName("测试部门2");
61
+//        data1.setProblemTotal(6);
62
+//        data1.setProblemComplete(1);
63
+//        data1.setProblemSuitable(2);
64
+        data1.setProblemEffective(3);
65
+        data1.setProblemCategoryOne(1);
66
+        data1.setProblemCategoryTwo(1);
67
+        data1.setProblemCategoryThree(2);
68
+        data1.setProblemCategoryFour(1);
69
+        data1.setProblemCategoryFive(4);
70
+        data1.setProblemCategorySix(1);
71
+        list.add(data1);
72
+
73
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
74
+        data2.setDeptId(102l);
75
+        data2.setDeptName("测试部门3");
76
+        data2.setProblemTotal(6);
77
+        data2.setProblemComplete(1);
78
+//        data2.setProblemSuitable(2);
79
+        data2.setProblemEffective(3);
80
+
81
+        data2.setProblemCategoryOne(1);
82
+//        data2.setProblemCategoryTwo(1);
83
+        data2.setProblemCategoryThree(1);
84
+//        data2.setProblemCategoryFour(1);
85
+        data2.setProblemCategoryFive(1);
86
+        data2.setProblemCategorySix(4);
87
+        list.add(data2);
57 88
         return success(list);
58 89
     }
59 90
 

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

@@ -54,6 +54,37 @@ public class PostCheckedRectificationProductionProblemStatisticsController exten
54 54
         data.setProblemCategorySix(1);
55 55
 
56 56
         list.add(data);
57
+
58
+        FunctionDeptProblemContrastView data1 = new FunctionDeptProblemContrastView();
59
+        data1.setDeptId(101l);
60
+        data1.setDeptName("测试部门2");
61
+//        data1.setProblemTotal(6);
62
+//        data1.setProblemComplete(1);
63
+//        data1.setProblemSuitable(2);
64
+        data1.setProblemEffective(3);
65
+        data1.setProblemCategoryOne(1);
66
+        data1.setProblemCategoryTwo(1);
67
+        data1.setProblemCategoryThree(2);
68
+        data1.setProblemCategoryFour(1);
69
+        data1.setProblemCategoryFive(4);
70
+        data1.setProblemCategorySix(1);
71
+        list.add(data1);
72
+
73
+        FunctionDeptProblemContrastView data2 = new FunctionDeptProblemContrastView();
74
+        data2.setDeptId(102l);
75
+        data2.setDeptName("测试部门3");
76
+        data2.setProblemTotal(6);
77
+        data2.setProblemComplete(1);
78
+//        data2.setProblemSuitable(2);
79
+        data2.setProblemEffective(3);
80
+
81
+        data2.setProblemCategoryOne(1);
82
+//        data2.setProblemCategoryTwo(1);
83
+        data2.setProblemCategoryThree(1);
84
+//        data2.setProblemCategoryFour(1);
85
+        data2.setProblemCategoryFive(1);
86
+        data2.setProblemCategorySix(4);
87
+        list.add(data2);
57 88
         return success(list);
58 89
     }
59 90
 

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

@@ -16,29 +16,29 @@ public class ProblemNumberBase implements Serializable {
16 16
 
17 17
 
18 18
     @ApiModelProperty("总数量")
19
-    private Integer problemTotal;
19
+    private int problemTotal;
20 20
 
21 21
 
22 22
     @ApiModelProperty("完整性数量")
23
-    private Integer problemComplete;
23
+    private int problemComplete;
24 24
     @ApiModelProperty("适宜性数量")
25
-    private Integer problemSuitable;
25
+    private int problemSuitable;
26 26
     @ApiModelProperty("有效性数量")
27
-    private Integer problemEffective;
27
+    private int problemEffective;
28 28
 
29 29
 
30 30
     @ApiModelProperty("职责权限问题")
31
-    private Integer problemCategoryOne;
31
+    private int problemCategoryOne;
32 32
     @ApiModelProperty("工作内容问题")
33
-    private Integer problemCategoryTwo;
33
+    private int problemCategoryTwo;
34 34
     @ApiModelProperty("工作标准问题")
35
-    private Integer problemCategoryThree;
35
+    private int problemCategoryThree;
36 36
     @ApiModelProperty("考核奖励问题")
37
-    private Integer problemCategoryFour;
37
+    private int problemCategoryFour;
38 38
     @ApiModelProperty("任职资格问题")
39
-    private Integer problemCategoryFive;
39
+    private int problemCategoryFive;
40 40
     @ApiModelProperty("其他")
41
-    private Integer problemCategorySix;
41
+    private int problemCategorySix;
42 42
 
43 43
 //==================================================
44 44