Merge branch 'dev_third_data' into dev_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java

@@ -29,7 +29,7 @@ public class AgencyGovrnFormDTO implements Serializable {
      * 党群自治占比:party
      * 网格自治占比:grid
      * 社区解决占比:community
-     * 区直部门解决占比:dept
+     * 区直部门解决占比:department
      * 街道解决占比:street
      */
     private String type;

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java

@@ -33,6 +33,9 @@ public class GridGovrnFormDTO implements Serializable {
      * 问题解决总数:problem
      * 党群自治占比:party
      * 网格自治占比:grid
+     * 社区解决占比:community
+     * 区直部门解决占比:department
+     * 街道解决占比:street
      */
     private String type;
     public interface Agency extends CustomerClientShowGroup {}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1240,6 +1240,12 @@ public class DataStatsServiceImpl implements DataStatsService {
                     return o2.getGroupSelfGovernRatio().compareTo(o1.getGroupSelfGovernRatio());
                 } else if ("grid".equals(formDTO.getType())) {
                     return o2.getGridSelfGovernRatio().compareTo(o1.getGridSelfGovernRatio());
+                } else if ("community".equals(formDTO.getType())) {
+                    return o2.getCommunityResolvedRatio().compareTo(o1.getCommunityResolvedRatio());
+                } else if ("department".equals(formDTO.getType())) {
+                    return o2.getDistrictDeptResolvedRatio().compareTo(o1.getDistrictDeptResolvedRatio());
+                } else if ("street".equals(formDTO.getType())) {
+                    return o2.getStreetResolvedRatio().compareTo(o1.getStreetResolvedRatio());
                 } else {
                     return o2.getProblemResolvedCount().compareTo(o1.getProblemResolvedCount());
                 }