From a218eadcb95c18737ef51b2247edc4830cc97c63 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 21 Jul 2020 18:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8E=BB=E6=8E=89=E4=BC=81=E4=B8=9A=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/user/result/ExportOperationDataResultDTO.java    | 2 +-
 .../epdc-module/epdc-analysis/epdc-analysis-server/Dockerfile | 2 +-
 .../com/elink/esua/epdc/excel/ExportOperationDataExcel.java   | 4 ++--
 .../modules/user/service/impl/UserAnalysisServiceImpl.java    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

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