Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ 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.homePage.*;
 import com.ruoyi.postCheck.service.IPostCheckedProblemService;
 import io.swagger.annotations.Api;
@@ -84,7 +85,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        最好给前端定义一个对象，用Map也可以
         List<Map<Integer, BigDecimal>> dataList = new ArrayList<>();
         Map<Integer, BigDecimal> data1 = new HashMap<>();
-        data1.put(0, new BigDecimal(0.9));
+        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));//适宜性问题
@@ -92,7 +93,7 @@ public class PostCheckedHomePageController extends BaseController {
 
         Map<Integer, BigDecimal> data2 = new HashMap<>();
 //        data2.put(0, new BigDecimal(0.9));
-        data2.put(1, new BigDecimal(0.95));//完整问题
+        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);
@@ -101,7 +102,7 @@ public class PostCheckedHomePageController extends BaseController {
         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(0.88));//有效性问题
+        data3.put(2, new BigDecimal(Arith.round(new BigDecimal(0.88).doubleValue(), 2)));//有效性问题
 //        data3.put(3, new BigDecimal(0.86));//适宜性问题
         dataList.add(data3);
 
@@ -109,7 +110,7 @@ public class PostCheckedHomePageController extends BaseController {
 //        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(0.86));//适宜性问题
+        data4.put(3, new BigDecimal(Arith.round(new BigDecimal(0.86).doubleValue(), 2)));//适宜性问题
         dataList.add(data4);
         return success(dataList);
     }
@@ -127,7 +128,7 @@ public class PostCheckedHomePageController extends BaseController {
         data1.setDeptName("测试部门V1");
         data1.setProblemTotal(10);
         data1.setProblemComplete(9);
-        data1.setProblemRectificationRate(new BigDecimal(0.9));
+        data1.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.9).doubleValue(), 2)));
         dataList.add(data1);
 
 
@@ -136,7 +137,7 @@ public class PostCheckedHomePageController extends BaseController {
         data2.setDeptName("测试部门V2");
         data2.setProblemTotal(8);
         data2.setProblemComplete(4);
-        data2.setProblemRectificationRate(new BigDecimal(0.5));
+        data2.setProblemRectificationRate(new BigDecimal(Arith.round(new BigDecimal(0.5).doubleValue(), 2)));
         dataList.add(data2);
 
         return success(dataList);
@@ -224,9 +225,10 @@ public class PostCheckedHomePageController extends BaseController {
         data1.setRating(1);
         data1.setDeptId(100l);
         data1.setDeptName("测试部门V1");
-        data1.setPostId(1l);
-        data1.setPostName("内操岗位");
-        data1.setScore(new BigDecimal(99.98));
+//        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);
     }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/AssessmentRatingView.java

@@ -25,11 +25,16 @@ public class AssessmentRatingView implements Serializable {
     @ApiModelProperty("部门名称")
     private String deptName;
 
-    @ApiModelProperty("岗位ID")
-    private Long postId;
+//    @ApiModelProperty("岗位ID")
+//    private Long postId;
+//    @ApiModelProperty("岗位名称")
+//    private String postName;
+
+    @ApiModelProperty("岗位数量")
+    private Integer postCount;
+
+
 
-    @ApiModelProperty("岗位名称")
-    private String postName;
 
     @ApiModelProperty("得分")
     private BigDecimal score;