feature 工伤率报表改为千分位

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AccidentServiceImpl.java

@@ -361,22 +361,22 @@ public class AccidentServiceImpl extends ServiceImpl<AccidentDao, AccidentDo> im
             //设值工厂ID
             aspAccidentReport.setTenantid(tenantId);
             //设值加上百分号
-            aspAccidentReport.setValue(aspAccidentReport.getValue() + "%");
+            aspAccidentReport.setValue(aspAccidentReport.getValue() + "‰");
             //计算总工伤数
             valueTotal += aspAccidentReport.getCount();
             //计算总人数
             peopleTotal += aspAccidentReport.getDepartpeople();
         }
         //计算月合计
-        double v = 0.00;
+        double v = 0.000;
         if(peopleTotal != 0){
-            v = (valueTotal * 1.0000 / peopleTotal * 1.0000) * 100.0000;
+            v = (valueTotal * 1.0000 / peopleTotal * 1.0000) * 1000.0000;
         }
         String monthTotal;
-        if(v == 0.00){
-            monthTotal = "0.00%";
+        if(v == 0.000){
+            monthTotal = "0.000%";
         }else {
-            monthTotal = BigDecimal.valueOf(v).setScale(2, RoundingMode.HALF_UP).toString() + "%";
+            monthTotal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP).toString() + "‰";
         }
         for (AspAccidentReport aspAccidentReport : list) {
             //设值月合计

cx-safe-check/cx-save-check-common/src/main/resources/mybatis/AccidentDao.xml

@@ -39,7 +39,7 @@
         max( ouc.orgids ) AS orgids,
         max( ouc.ORG_TOTAL ) AS departpeople,
         COUNT( aa.ID ) AS count,
-        IFNULL(round( COUNT( aa.ID )/ max( ouc.ORG_TOTAL )* 100, 2 ),0.00) AS value
+        IFNULL(round( COUNT( aa.ID )/ max( ouc.ORG_TOTAL )* 1000, 3 ),0.000) AS value
         FROM
         ORG_USER_COUNT ouc
         LEFT JOIN asp_accident aa ON FIND_IN_SET( aa.ACCIDENTDEPT, ouc.orgids )

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/vo/AspAccidentReportVo.java

@@ -17,67 +17,67 @@ public class AspAccidentReportVo{
     /**
      * 1月
      */
-    private String count1 = "0.00%";
+    private String count1 = "0.000%";
 
     /**
      * 2月
      */
-    private String count2 = "0.00%";
+    private String count2 = "0.000%";
 
     /**
      * 3月
      */
-    private String count3 = "0.00%";
+    private String count3 = "0.000%";
 
     /**
      * 4月
      */
-    private String count4 = "0.00%";
+    private String count4 = "0.000%";
 
     /**
      * 5月
      */
-    private String count5 = "0.00%";
+    private String count5 = "0.000%";
 
     /**
      * 6月
      */
-    private String count6 = "0.00%";
+    private String count6 = "0.000%";
 
     /**
      * 7月
      */
-    private String count7 = "0.00%";
+    private String count7 = "0.000%";
 
     /**
      * 8月
      */
-    private String count8 = "0.00%";
+    private String count8 = "0.000%";
 
     /**
      * 9月
      */
-    private String count9 = "0.00%";
+    private String count9 = "0.000%";
 
     /**
      * 10月
      */
-    private String count10 = "0.00%";
+    private String count10 = "0.000%";
 
     /**
      * 11月
      */
-    private String count11 = "0.00%";
+    private String count11 = "0.000%";
 
     /**
      * 12月
      */
-    private String count12 = "0.00%";
+    private String count12 = "0.000%";
 
     /**
      * 合计
      */
-    private String countAll = "0.00%";
+    private String countAll = "0.000%";
 
     /**
      * 部门人数