Merge branch 'feature/exportOperationData'

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java

@@ -73,4 +73,9 @@ public class ExportOperationDataResultDTO implements Serializable {
      */
     private String streetName;
 
+    /**
+     * 企业数
+     */
+    private int enterpriseCount = 0;
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java

@@ -23,6 +23,9 @@ public class ExportOperationDataExcel implements Serializable {
     @Excel(name = "居民数")
     private int registerCount = 0;
 
+    @Excel(name = "企业数")
+    private int enterpriseCount = 0;
+
     @Excel(name = "已认证党员数")
     private int partyCount = 0;
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java

@@ -232,4 +232,15 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      */
     List<ExportOperationDataResultDTO> selectExportTopicCount(ExportOperationFormDTO exportOperationFormDTO);
 
+
+    /***
+     * 运营数据导出企业数
+     * @param exportOperationFormDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/3/23 15:16
+     */
+    List<ExportOperationDataResultDTO> selectExportEnterpriseCount(ExportOperationFormDTO exportOperationFormDTO);
+
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -304,6 +304,9 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         List<ExportOperationDataResultDTO> communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO);
         // 话题
         List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
+
+        // 企业
+        List<ExportOperationDataResultDTO> enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO);
         //居民数
         for(int i= 0;i<exportOperationDataResultDTOS.size();i++){
             for(ExportOperationDataResultDTO item:unAuthorizedResultDTOS){
@@ -320,6 +323,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             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());
+
         }
         return exportOperationDataResultDTOS;
     }

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

@@ -694,6 +694,36 @@
         t0.id ASC
     </select>
 
+    <select id="selectExportEnterpriseCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
+        SELECT
+            t0.`name` streetName,
+            count(uu.ID) enterpriseCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+        ad.id IN <include refid="foreachAllDeptIdsShow"></include>
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_custom.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
+        AND uu.DEL_FLAG = '0'
+        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
+            AND uu.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and uu.CREATED_TIME &lt;=#{endTime}
+        </if>
+        GROUP BY
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
+
     <!--循环街道id集合-->
     <sql id="foreachAllDeptIdsShow">
         <foreach collection="allStreetIds" item="item" open="(" separator="," close=")">