公众参与service修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java

@@ -51,12 +51,12 @@ public class UserjoinResultDTO implements Serializable {
     /**
      * 平均参与度
      */
-    private Integer avgJoin;
+    private Double avgJoin;
 
     /**
      * 人均议题
      */
-    private Integer avgIssue;
+    private Double avgIssue;
     private String areaCode;
     private Integer avgIssueFz;
     private Integer avgIssueFm;

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml

@@ -1985,7 +1985,12 @@ select  gr.id as orgId,
             shoudJoin.id as orgId,
             shoudJoin.name as orgName,
             shoudJoin.pid as parentId,
-            shoudJoin.type_key as orgType,
+            case shoudJoin.type_key
+             when 'grid_party' then 'grid'
+             when 'community_party' then 'agency'
+             when 'street_party' then 'agency'
+             else '' end
+            as orgType,
             shoudJoin.area_code as area_code,
             ifnull(round(ifnull(shoudJoin.issueNum,0)/ifnull(shoudJoin.userNum,0) ,2),0) as avgIssue,
             ifnull(shoudJoin.issueNum,0) as avgIssueFz,