Browse Source

用户数据分析-运营数据导出去掉企业数

feature/syp_points
liuchuang 5 years ago
parent
commit
a218eadcb9
  1. 2
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile
  3. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/ExportOperationDataExcel.java
  4. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

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

@ -76,6 +76,6 @@ public class ExportOperationDataResultDTO implements Serializable {
/**
* 企业数
*/
private int enterpriseCount = 0;
//private int enterpriseCount = 0;
}

2
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile

@ -16,5 +16,5 @@ ENV DATAPATH /data
# 挂载/data目录到主机
VOLUME $DATAPATH
# 启动容器时执行
ENTRYPOINT java -jar $JAR_CONFIG $JAR_PATH
ENTRYPOINT java -jar -Xmx512m $JAR_PATH
EXPOSE ${SERVER_PORT}

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

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

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

@ -178,7 +178,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
// List<ExportOperationDataResultDTO> topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO);
// 企业
List<ExportOperationDataResultDTO> enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO);
// List<ExportOperationDataResultDTO> enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO);
//居民数
for (int i = 0; i < exportOperationDataResultDTOS.size(); i++) {
exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.get(i).getNewsCount());
@ -188,7 +188,7 @@ 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());
// exportOperationDataResultDTOS.get(i).setEnterpriseCount(enterpriseDataResultDTOS.get(i).getEnterpriseCount());
}
return exportOperationDataResultDTOS;

Loading…
Cancel
Save