Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev_temp

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/GrassRootsGovernRankResultDTO.java

@@ -39,4 +39,9 @@ public class GrassRootsGovernRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

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

@@ -35,4 +35,9 @@ public class GrassRootsGovernResultDTO implements Serializable {
 	 * 办结率（当前界面是社区时显示）
 	 */
 	private String closedProjectRatio;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

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

@@ -31,4 +31,6 @@ public class GrassRootsOrgRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	private String monthId;
 }

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

@@ -27,4 +27,9 @@ public class GrassRootsOrgResultDTO implements Serializable {
 	 * 项目数
 	 */
 	private Integer projectTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	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/PmTotalResultDTO.java

@@ -31,4 +31,9 @@ public class PmTotalResultDTO implements Serializable {
 	 * 议题数
 	 */
 	private Integer issueTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

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

@@ -27,4 +27,6 @@ public class ProjectProfileResultDTO implements Serializable {
 	 * 级别
 	 */
 	private String level;
+
+	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))
+        if(CollectionUtils.isEmpty(subCustomers)) {
-			 fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
+            fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
-		else
+        }else {
-			fineExampleResultDTO = screenPioneerDataDao.selectFineExampleByAreaCode(areaCode,customerId,subCustomers);
+            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
@@ -51,9 +52,6 @@
                 #{orgId}
             </foreach>
             AND rankData.MONTH_ID =#{monthId}
-            ORDER BY
-            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,
-             rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC
          )
         union
         (
@@ -64,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)
@@ -78,11 +77,12 @@
                 #{orgId}
             </foreach>
             AND rankData.MONTH_ID =#{monthId}
-            ORDER BY
-            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,
-            rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO
-            DESC
         )
+        ORDER BY
+        RESPONSE_RATIO DESC,
+        RESOLVED_RATIO DESC,
+        GOVERN_RATIO DESC,
+        SATISFACTION_RATIO DESC
     </select>
 
 </mapper>

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

@@ -300,8 +300,8 @@
                 sca.del_flag = '0'
                 AND sca.PARENT_AREA_CODE=#{areaCode}
                 and sy.CUSTOMER_ID=#{customerId}
-        ORDER BY index_total DESC
+        ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
-                LIMIT #{topNum}
+        LIMIT #{topNum}
     </select>
 
     <select id="selectSubGridByAreaCode" parameterType="map" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
@@ -321,7 +321,7 @@
                 scg.del_flag = '0'
                 AND scg.AREA_CODE like CONCAT(#{areaCode},'%')
                 and sy.CUSTOMER_ID=#{customerId}
-        ORDER BY index_total DESC
+        ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
                 LIMIT #{topNum}
     </select>
 </mapper>

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/ScreenProjectGridDailyDao.xml

@@ -20,6 +20,7 @@
             m.DEL_FLAG = '0'
             AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
             AND M.DATE_ID=#{dateId}
+            order by resolvedRatio desc
     </select>
 
     <select id="selectLastDateId" resultType="java.lang.String">

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

@@ -51,5 +51,6 @@
                 order by t1.DATE_ID desc
                 limit 1
             )and m.CUSTOMER_ID=#{customerId}
+            order by resolvedRatio desc
     </select>
 </mapper>

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

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml

@@ -5,7 +5,8 @@
     <select id="selectProjectProfile" resultType="com.epmet.evaluationindex.screen.dto.result.ProjectProfileResultDTO">
         SELECT ORG_ID,
                PROJECT_TOTAL,
-               LEVEL
+               LEVEL,
+               DATA_END_TIME as dataEndTime
         FROM screen_an_community_project_profile
         WHERE DEL_FLAG = 0
         AND CUSTOMER_ID = #{customerId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml

@@ -9,7 +9,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -55,7 +56,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml

@@ -7,7 +7,8 @@
     <select id="selectGrassRootsOrg" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsOrgResultDTO">
         SELECT GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -47,7 +48,8 @@
         SELECT ORG_NAME,
                GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml

@@ -7,7 +7,8 @@
         SELECT GROUP_MEMBER_TOTAL,
                TOPIC_TOTAL,
                TOPIC_PARTI_USER_TOTAL,
-               ISSUE_TOTAL
+               ISSUE_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_pm_total_monthly
         WHERE DEL_FLAG = '0'
           AND ORG_ID = #{agencyId}