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 cf87a8027..3762374e1 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 @@ -73,4 +73,9 @@ public class ExportOperationDataResultDTO implements Serializable { */ private String streetName; + /** + * 企业数 + */ + private int enterpriseCount = 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 e61be0af4..4091895ea 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 @@ -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; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 6220046cb..5b7b63619 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/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 { */ List selectExportTopicCount(ExportOperationFormDTO exportOperationFormDTO); + + /*** + * 运营数据导出企业数 + * @param exportOperationFormDTO + * @return java.util.List + * @author qushutong + * @date 2020/3/23 15:16 + */ + List selectExportEnterpriseCount(ExportOperationFormDTO exportOperationFormDTO); + + } 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 6ee7b0f6c..79b3bf943 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 @@ -304,6 +304,9 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl communityMemberDataResultDTOS = baseDao.selectExportCommunityMemberCount(exportOperationFormDTO); // 话题 List topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO); + + // 企业 + List enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO); //居民数 for(int i= 0;i + +