Merge branch 'dev_third_data' into dev_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java

@@ -24,14 +24,14 @@ public class AgencyGovrnResultDTO implements Serializable {
     //问题解决总数
     private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal groupSelfGovernRatio = bi;
+    private String groupSelfGovernRatio = "0%";
     //网格自治占比
-    private BigDecimal gridSelfGovernRatio = bi;
+    private String gridSelfGovernRatio = "0%";
     //社区解决占比
-    private BigDecimal communityResolvedRatio = bi;
+    private String communityResolvedRatio = "0%";
     //区直部门解决占比
-    private BigDecimal districtDeptResolvedRatio = bi;
+    private String districtDeptResolvedRatio = "0%";
     //街道解决占比
-    private BigDecimal streetResolvedRatio = bi;
+    private String streetResolvedRatio = "0%";
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java

@@ -22,14 +22,14 @@ public class GridGovrnResultDTO implements Serializable {
     //问题解决总数
     private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal groupSelfGovernRatio = bi;
+    private String groupSelfGovernRatio = "0%";
     //网格自治占比
-    private BigDecimal gridSelfGovernRatio = bi;
+    private String gridSelfGovernRatio = "0%";
     //社区解决占比
-    private BigDecimal communityResolvedRatio = bi;
+    private String communityResolvedRatio = "0%";
     //区直部门解决占比
-    private BigDecimal districtDeptResolvedRatio = bi;
+    private String districtDeptResolvedRatio = "0%";
     //街道解决占比
-    private BigDecimal streetResolvedRatio = bi;
+    private String streetResolvedRatio = "0%";
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -618,11 +618,11 @@
             agency_id AS agencyId,
             `level` AS level,
             problem_resolved_count AS problemResolvedCount,
-            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
+            concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
-            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
+            concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
-            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
+            concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
-            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
+            concat(ROUND(street_closed_ratio*100, 1),'%') AS streetResolvedRatio,
-            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
+            concat(ROUND(district_dept_closed_ratio*100, 1),'%') AS districtDeptResolvedRatio
         FROM
             fact_agency_govern_daily
         WHERE
@@ -638,11 +638,11 @@
         SELECT
             grid_id AS gridId,
             problem_resolved_count AS problemResolvedCount,
-            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
+            concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
-            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
+            concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
-            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
+            concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
-            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
+            concat(ROUND(street_closed_ratio*100, 1),'%') AS streetResolvedRatio,
-            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
+            concat(ROUND(district_dept_closed_ratio*100, 1),'%') AS districtDeptResolvedRatio
         FROM
             fact_grid_govern_daily
         WHERE