Merge remote-tracking branch 'remotes/origin/dev'

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;

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()) ?

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,