公众参与 较上月增长/下降率 返回绝对值

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java

@@ -33,14 +33,17 @@ public class PublicPartiProfileResultDTO implements Serializable {
 
     /**
      * 较上月趋势：incr上升，decr下降
-     * */
+     */
     private String issueCompareLatestTrend = "";
 
     /**
      * 平均参与度
-     * */
+     */
     private Integer averageJoin = NumConstant.ZERO;
 
+    /**
+     * 较上月百分比
+     */
     private String joinCompareLatestMonth = "";
 
     private String joinCompareLatestTrend = "";

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java

@@ -108,18 +108,17 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         UserJoinIndicatorGrowthRateResultDTO latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
         //保证获取公众参与概率数据的最大可能性
         int time = NumConstant.TWELVE;
-        while(null == latest && time > NumConstant.ONE)
+        while (null == latest && time > NumConstant.ONE) {
-            {
+            time--;
-                time --;
+            monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
-                monthId = dateUtils.getPreviousMonthIdByDest(null,monthId);
+            latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
-                latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
+        }
-            }
 
-        if(null == latest) return new PublicPartiProfileResultDTO();
+        if (null == latest) return new PublicPartiProfileResultDTO();
-        PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest,PublicPartiProfileResultDTO.class);
+        PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest, PublicPartiProfileResultDTO.class);
-        result.setMonthIncr(convertPercentStr(latest.getMonthIncr(),NumConstant.ZERO));
+        result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO));
-        result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth(),NumConstant.ZERO));
+        result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO));
-        result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth(),NumConstant.ZERO));
+        result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO));
         return result;
     }