From c7c8cd0ab4c3fd72f153074da609abb07b003662 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 7 Jun 2021 13:32:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1=20?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueProjectCategoryDictServiceImpl.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 6e61017ed1..9236ff80a5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -503,15 +503,15 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
      * @date 2021/5/17 2:16 下午
      */
     public String disposeCategory(List<ProjectCategoryDisPoseResultDTO> list){
-        String result = "";
+        StringBuilder r = new StringBuilder();
         if (!CollectionUtils.isEmpty(list)){
             list.forEach(l -> {
-                result.concat(l.getCategoryName()).concat(",");
+                r.append(l.getCategoryName()).append(",");
             });
         }
-        if (StringUtils.isEmpty(result)){
-            return result;
+        if (StringUtils.isEmpty(r.toString())){
+            return r.toString();
         }
-        return result.substring(NumConstant.ZERO,result.length()-NumConstant.ONE);
+        return r.toString().substring(NumConstant.ZERO,r.length()-NumConstant.ONE);
     }
 }

From bf8e539e3b683dd5b3e2bad784a85b0311d5e154 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 8 Jun 2021 09:56:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=8F=8Ajob=E7=9A=84=E7=AD=89=E5=BE=85=E6=97=B6=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StatsGroupServiceImpl.java | 11 +++++------
 .../com/epmet/task/StatsGroupAgencyDailyTask.java     |  3 ++-
 .../epmet-job-server/src/main/resources/bootstrap.yml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index 50382aa75e..e75870980f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -83,13 +83,12 @@ public class StatsGroupServiceImpl implements StatsGroupService {
         Integer pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds = new ArrayList<>();
 
-        if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
-            customerIds.add(formDTO.getCustomerId());
-        } else {
-            customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
-        }
         do {
-
+            if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
+                customerIds.add(formDTO.getCustomerId());
+            } else {
+                customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+            }
             DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
             if (customerIds.size() != NumConstant.ZERO) {
                 customerIds.forEach(customerId -> {
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
index f5ff55f74e..a8f8c7802d 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
@@ -1,5 +1,6 @@
 package com.epmet.task;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsGroupService;
 import org.slf4j.Logger;
@@ -28,7 +29,7 @@ public class StatsGroupAgencyDailyTask implements ITask {
         if (result.success()){
             logger.info("StatsGroupAgencyDailyTask定时任务执行成功");
         }else {
-            logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg());
+            logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" , JSON.toJSONString(result));
         }
     }
 }
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index 20fc7cb138..aa0d5545ed 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 60000 #缺省为1000
+            timeoutInMilliseconds: 90000 #缺省为1000
 
 ribbon:
   ReadTimeout: 300000