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 4b8dc524..f3312c28 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 @@ -76,6 +76,6 @@ public class ExportOperationDataResultDTO implements Serializable { /** * 企业数 */ - private int enterpriseCount = 0; + //private int enterpriseCount = 0; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile index fc459b9c..2ae5c4af 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile +++ b/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} 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 62e286ec..f4c21633 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,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; 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 277e6e5f..96aadaf9 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 @@ -178,7 +178,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl topicDataResultDTOS = baseDao.selectExportTopicCount(exportOperationFormDTO); // 企业 - List enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO); + // List 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