From 5790421b58182715e0d20065e748c819cf3e232a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 9 Jul 2021 16:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Eservice?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/screen/result/UserjoinResultDTO.java | 4 ++-- .../main/resources/mapper/screen/ScreenPublicDataDao.xml | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java index b5002e84..add1cbb0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 52deb1be..38360d6d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/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,