From 2822d448f7f5fcde20e24537c9ad3944af42fc0b Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Mon, 20 Jul 2020 17:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=94=A6=E6=B0=B4pc=E7=AB=AF=E3=80=91?= =?UTF-8?q?-=E3=80=90=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E6=9E=90=E3=80=91=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98=E6=95=B0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=AF=BC=E5=87=BA=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20-=E9=AD=8F=E5=87=AF=202020-07-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ExportOperationDataResultDTO.java | 22 +++++++++---------- .../epdc/excel/ExportOperationDataExcel.java | 16 +++++++------- .../service/impl/UserAnalysisServiceImpl.java | 12 +++++----- .../resources/mapper/user/UserAnalysisDao.xml | 20 +---------------- 4 files changed, 26 insertions(+), 44 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java index 3762374e..4b8dc524 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java @@ -56,17 +56,17 @@ public class ExportOperationDataResultDTO implements Serializable { /** * 社群数 */ - private int communityCount = 0; - - /** - * 社群成员数 - */ - private int communityMemberCount = 0; - - /** - * 社群话题数 - */ - private int communityTopicCount = 0; +// private int communityCount = 0; +// +// /** +// * 社群成员数 +// */ +// private int communityMemberCount = 0; +// +// /** +// * 社群话题数 +// */ +// private int communityTopicCount = 0; /** * 街道 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java index 4091895e..62e286ec 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java @@ -42,14 +42,14 @@ public class ExportOperationDataExcel implements Serializable { @Excel(name = "项目结案数") private int itemCloseCount = 0; - @Excel(name = "社群数") - private int communityCount = 0; - - @Excel(name = "社群成员数") - private int communityMemberCount = 0; - - @Excel(name = "社群话题数") - private int communityTopicCount = 0; +// @Excel(name = "社群数") +// private int communityCount = 0; +// +// @Excel(name = "社群成员数") +// private int communityMemberCount = 0; +// +// @Excel(name = "社群话题数") +// private int communityTopicCount = 0; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index d0adc4c7..277e6e5f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -171,11 +171,11 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl itemDataResultDTOS = baseDao.selectExportItemCount(exportOperationFormDTO); // 社群 - List groupDataResultDTOS = baseDao.selectExportGroupCount(exportOperationFormDTO); + // List groupDataResultDTOS = baseDao.selectExportGroupCount(exportOperationFormDTO); // 社群成员 - List communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO); + // List communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO); // 话题 - List topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO); + // List topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO); // 企业 List enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO); @@ -185,9 +185,9 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl - AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') - BETWEEN #{startTime} AND #{endTime} - - AND GRID_ID =dept.id - ) - + - ( SELECT count(1) FROM @@ -58,7 +44,6 @@ BETWEEN #{startTime} AND #{endTime} AND GRID_ID =dept.id - ) ) AS eventCount FROM js_esua_epdc_admin.sys_dept dept @@ -445,10 +430,7 @@ ad.id IN AND ad.del_flag = 0 ) t0 - LEFT JOIN (select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from js_esua_epdc_events.epdc_issue eie - left join js_esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID - where sd.del_flag='0' - union all + LEFT JOIN ( SELECT eve.ID, eve.ALL_DEPT_IDS,