Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

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

@@ -25,7 +25,7 @@ public class PublicPartiProfileResultDTO implements Serializable {
      * */
     private String monthTrend = "";
 
-    private BigDecimal averageIssue = new BigDecimal(NumConstant.ZERO);
+    private Integer averageIssue = NumConstant.ZERO;
 
     /**
      * 较上月百分比

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

@@ -38,8 +38,8 @@ public class UserJoinIndicatorGrowthRateResultDTO implements Serializable {
 
     /**
      * 平均参与度
-     * */
-    private Integer averageJoin;
+     */
+    private BigDecimal averageJoin;
 
     private BigDecimal joinCompareLatestMonth;
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@@ -10,7 +10,7 @@
             ROUND( AVG_JOIN, 1 ) AS averageJoin,
             JOIN_TOTAL_UP_RATE AS monthIncr,
             JOIN_TOTAL_UP_FLAG AS monthTrend,
-            ROUND(AVG_ISSUE,1) AS averageIssue,
+            AVG_ISSUE AS averageIssue,
             AVG_ISSUE_UP_RATE AS issueCompareLatestMonth,
             AVG_ISSUE_UP_FLAG AS issueCompareLatestTrend,
             AGVG_JOIN_UP_RATE AS joinCompareLatestMonth,

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.screencoll.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 9、党建引领|基层治理-居民（党员）积分排行榜 入参
@@ -64,6 +65,11 @@ public class PartyUserRankDataFormDTO implements Serializable {
      */
     private Integer pointTotal;
 
+    /**
+     * 指标得分
+     */
+    private BigDecimal indexScore;
+
     /**
      * 姓
      */

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyUserRankDataDao.xml

@@ -30,6 +30,7 @@
         `NAME`,
         USER_NAME,
         POINT_TOTAL,
+        INDEX_SCORE,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -53,6 +54,7 @@
             #{item.name},
             #{item.userName},
             #{item.pointTotal},
+            IFNULL(#{item.indexScore},0),
             0,
             0,
             'APP_USER',

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java

@@ -80,9 +80,14 @@ public class ExtAppJwtTokenUtils {
         //String appId = "acc4ad66c82a7b46e741364b4c62dce2";
         // String customrId = "b09527201c4409e19d1dbc5e3c3429a1";
         //孔村
+//        String secret = "c4096eb0497943c78327c5192621b209c38f20592f6a49cc8c79e8b77f3bd5c8";
+//        String appId = "f358d63a89f3670c197c62ca4c3a0366";
+//        String customrId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+
+        //测试-模拟客户
         String secret = "c4096eb0497943c78327c5192621b209c38f20592f6a49cc8c79e8b77f3bd5c8";
         String appId = "f358d63a89f3670c197c62ca4c3a0366";
-        String customrId = "2fe0065f70ca0e23ce4c26fca5f1d933";
+        String customrId = "45687aa479955f9d06204d415238f7cc";
 
         claim.put("customerId", customrId);
         claim.put("appId", appId);