返参增加monthId/dataEndTime,方便知道数据所属月

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

@@ -87,4 +87,6 @@ public class FineExampleResultDTO implements Serializable {
      * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比
      */
     private String platJoinPartyRatio = "0.00%";
+
+    private String dataEndTime;
 }

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

@@ -44,4 +44,6 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 当前agencyName的上一级组织名称
      */
     private String parentAgencyName;
+
+    private String monthId;
 }

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

@@ -46,4 +46,6 @@ public class GovernCapacityResultDTO implements Serializable {
     private String parentAgencyName;
 
     private String orgId;
+
+    private String monthId;
 }

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

@@ -56,4 +56,8 @@ public class OrgRankDataResultDTO implements Serializable {
      */
     private String parentAgencyName;
 
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }

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

@@ -28,4 +28,6 @@ public class PartyUserPointResultDTO implements Serializable {
      * 用户积分
      * */
     private Integer point;
+
+    private String dataEndTime;
 }

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

@@ -49,4 +49,8 @@ public class PublicPartiProfileResultDTO implements Serializable {
 
     private String joinCompareLatestTrend = "";
 
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }

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

@@ -42,4 +42,6 @@ public class TopProfileResultDTO implements Serializable {
      * 项目总数
      */
     private Integer projectNum = 0;
+
+    private String dataEndTime;
 }

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

@@ -160,6 +160,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO));
         result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO));
         result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO));
+        result.setMonthId(monthId);
         return result;
     }
 
@@ -249,6 +250,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
             rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
             rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
             rank.setParentAgencyName(o.getParentAgencyName());
+            rank.setMonthId(o.getMonthId());
             result.add(rank);
         });
         return result;

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

@@ -82,10 +82,10 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         else
             {subCustomers = crmResponse.getData();}
 		FineExampleResultDTO fineExampleResultDTO;
-        if(CollectionUtils.isEmpty(subCustomers))
-			 fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
-		else
-			fineExampleResultDTO = screenPioneerDataDao.selectFineExampleByAreaCode(areaCode,customerId,subCustomers);
+        if(CollectionUtils.isEmpty(subCustomers)) {
+            fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
+        }else {
+            fineExampleResultDTO = screenPioneerDataDao.selectFineExampleByAreaCode(areaCode, customerId, subCustomers);
 
             if (null == fineExampleResultDTO) {
                 return new FineExampleResultDTO();
@@ -96,7 +96,8 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
             fineExampleResultDTO.setTopicRatio(this.getRatio(fineExampleResultDTO.getTopicRatioA()));
             fineExampleResultDTO.setShiftProjectRatio(this.getRatio(fineExampleResultDTO.getShiftProjectRatioA()));
             fineExampleResultDTO.setPlatJoinPartyRatio(this.getRatio(Double.valueOf(fineExampleResultDTO.getPlatJoinPartyRatio())));
-            return fineExampleResultDTO;
+        }
+        return fineExampleResultDTO;
     }
 
     /**

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

@@ -35,7 +35,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            pa.AGENCY_NAME AS parentAgencyName
+            pa.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_agency agency
             left join screen_customer_agency pa
                 on(agency.PARENT_AREA_CODE=pa.AREA_CODE
@@ -61,7 +62,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            ca.agency_name AS parentAgencyName
+            ca.agency_name AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_grid grid
             left join screen_customer_agency ca
              on (ca.agency_id = grid.parent_agency_id)

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

@@ -13,7 +13,8 @@
             rankData.PROJECT_TOTAL AS projectNum,
             rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
             rankData.SATISFACTION_RATIO AS satisfactionRatio,
-            agency.AGENCY_NAME AS parentAgencyName
+            agency.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID
         FROM
             screen_org_rank_data rankData
         LEFT JOIN screen_customer_agency agency
@@ -43,7 +44,8 @@
                     rankData.PROJECT_TOTAL AS projectNum,
                     rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
                     rankData.SATISFACTION_RATIO AS satisfactionRatio,
-                    agency.AGENCY_NAME AS parentAgencyName
+                    agency.AGENCY_NAME AS parentAgencyName,
+                    rankData.MONTH_ID
             FROM
                     screen_org_rank_data rankData
             left join screen_customer_grid scg on(

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

@@ -102,7 +102,8 @@
         SELECT
                 m.USER_ID,
                 concat( m.surname, CASE char_length( m.NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
-                m.POINT_TOTAL AS point
+                m.POINT_TOTAL AS point,
+                m.DATA_END_TIME
         FROM
                 screen_party_user_rank_data m
         left join screen_customer_grid scg

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

@@ -17,7 +17,8 @@
             publish_issue_total AS publishIssueTotal,
             IFNULL(publish_issue_ratio,0) AS publishIssueRatioA,
             PLAT_ISSUE_TOTAL AS platIssueTotal,
-            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio
+            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data
         WHERE
@@ -44,7 +45,8 @@
             CEILING(avg(data.publish_issue_total)) AS publishIssueTotal,
             IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA,
             CEILING(avg(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
-            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio
+            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data data
 

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

@@ -38,7 +38,8 @@
             group_total AS groupNum,
             topic_total AS topicNum,
             issue_total AS issueNum,
-            project_total AS projectNum
+            project_total AS projectNum,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_user_total_data
         WHERE