From 182e23253980310c1ba186cfdac7b316c9daa72a Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 4 Jun 2021 15:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=95=B0=E6=8D=AEid=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=20=E5=86=8D=E7=BB=A7=E7=BB=AD=E4=B8=8B=E4=B8=AA?=
 =?UTF-8?q?=E6=9C=88=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java | 2 ++
 .../screen/impl/GrassRootsGovernServiceImpl.java                | 2 +-
 .../src/main/resources/mapper/screen/ScreenUserJoinDao.xml      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
index c72c561c07..cb4e514556 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
@@ -15,6 +15,8 @@ import java.math.BigDecimal;
 public class UserJoinIndicatorGrowthRateResultDTO implements Serializable {
     private static final long serialVersionUID = -8830240350298414599L;
 
+    private String id,
+
     private Integer total;
 
     private BigDecimal monthIncr;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index e427ad9e3b..b74a777bd5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -147,7 +147,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
                 screenUserJoinDao.selectUserJoinDataByAreaCode(agencyInfo.getAreaCode(),monthId);
         //保证获取公众参与概率数据的最大可能性
         int time = NumConstant.TWELVE;
-        while (null == latest && time > NumConstant.ONE) {
+        while ((null == latest || latest.getId() == null) && time > NumConstant.ONE) {
             time--;
             monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
             latest = CollectionUtils.isEmpty(subCustomers)||StringUtils.isBlank(agencyInfo.getAreaCode()) ?
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 5af47f5590..de0473571e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -28,6 +28,7 @@
     <!-- 根据地区码查询用户参与数据 -->
     <select id="selectUserJoinDataByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
         SELECT
+        scj.ID,
         IFNULL(avg( scj.JOIN_TOTAL ),0) AS total,
         IFNULL(ROUND( avg( scj.AVG_JOIN ), 1 ),0) AS averageJoin,
         IFNULL(avg( scj.JOIN_TOTAL_UP_RATE ),0) AS monthIncr,