【锦水pc端】-【用户数据分析】修改议题数计算方式，去掉运营导出部分字段 -魏凯 2020-07-20

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;
 
     /**
      * 街道

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;
 
 
 }

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<UserAnalysisDao, Us
         // 项目
         List<ExportOperationDataResultDTO> itemDataResultDTOS = baseDao.selectExportItemCount(exportOperationFormDTO);
         // 社群
-        List<ExportOperationDataResultDTO> groupDataResultDTOS = baseDao.selectExportGroupCount(exportOperationFormDTO);
+      //  List<ExportOperationDataResultDTO> groupDataResultDTOS = baseDao.selectExportGroupCount(exportOperationFormDTO);
         // 社群成员
-        List<ExportOperationDataResultDTO> communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO);
+      //  List<ExportOperationDataResultDTO> communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO);
         // 话题
-        List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
+      //  List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
 
         // 企业
         List<ExportOperationDataResultDTO> enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO);
@@ -185,9 +185,9 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.get(i).getItemCount());
             exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.get(i).getItemCloseCount());
             exportOperationDataResultDTOS.get(i).setEventCount(eventDataResultDTOS.get(i).getEventCount());
-            exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.get(i).getCommunityCount());
-            exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
-            exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.get(i).getCommunityTopicCount());
+//            exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.get(i).getCommunityCount());
+//            exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
+//            exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.get(i).getCommunityTopicCount());
             exportOperationDataResultDTOS.get(i).setEnterpriseCount(enterpriseDataResultDTOS.get(i).getEnterpriseCount());
 
         }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -33,20 +33,6 @@
 
         ) AS noticeCount,
         (
-        (SELECT
-        count(1)
-        FROM
-        js_esua_epdc_events.epdc_issue
-        WHERE
-        DEL_FLAG = '0'
-        <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d')
-            BETWEEN #{startTime} AND #{endTime}
-        </if>
-        AND GRID_ID =dept.id
-        )
-        +
-        (
         SELECT
         count(1)
         FROM
@@ -58,7 +44,6 @@
             BETWEEN #{startTime} AND #{endTime}
         </if>
         AND GRID_ID =dept.id
-        )
         ) AS eventCount
         FROM
         js_esua_epdc_admin.sys_dept dept
@@ -445,10 +430,7 @@
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 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,