党建引领-先进排行榜榜单、基层治理的 公众参与排行新增上级组织名称返参，党员联系群众去掉直属网格的数据

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

@@ -50,4 +50,9 @@ public class AdvanceBranchRankResultDTO implements Serializable {
      * */
     private Integer projectNum;
 
+	/**
+	 * 当前name的上级组织名称 2021-01-11新增
+	 */
+	private String parentAgencyName;
+
 }

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

@@ -51,4 +51,9 @@ public class OrgRankDataResultDTO implements Serializable {
      * */
     private Integer projectNum;
 
+    /**
+     * 当前name的上级组织名称 2021-01-11新增
+     */
+    private String parentAgencyName;
+
 }

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

@@ -25,4 +25,6 @@ public class PublicPartiRankResultDTO implements Serializable {
     private Integer issueNum;
 
     private Integer projectNum;
+
+    private String parentAgencyName;
 }

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

@@ -6,28 +6,31 @@
     <!-- 查询指定机关的直属网格月度数据 -->
     <select id="selectGridDataMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.OrgRankDataResultDTO">
         SELECT
-            ORG_NAME AS NAME,
+            rankData.ORG_NAME AS NAME,
-            PARTY_TOTAL AS partyMemberNum,
+            rankData.PARTY_TOTAL AS partyMemberNum,
-            GROUP_TOTAL AS branchNum,
+            rankData.GROUP_TOTAL AS branchNum,
-            ISSUE_TOTAL AS issueNum,
+            rankData.ISSUE_TOTAL AS issueNum,
-            PROJECT_TOTAL AS projectNum,
+            rankData.PROJECT_TOTAL AS projectNum,
-            CLOSE_PROJECT_RATIO AS closedProjectRatio,
+            rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
-            SATISFACTION_RATIO AS satisfactionRatio
+            rankData.SATISFACTION_RATIO AS satisfactionRatio,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_org_rank_data
+            screen_org_rank_data rankData
+        LEFT JOIN screen_customer_agency agency
+        ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = 0
         WHERE
-            DEL_FLAG = '0'
+            rankData.DEL_FLAG = '0'
-            AND ORG_TYPE = 'grid'
+            AND rankData.ORG_TYPE = 'grid'
-            AND ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+            AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
-            AND MONTH_ID = #{monthId}
+            AND rankData.MONTH_ID = #{monthId}
             ORDER BY
-            (PARTY_TOTAL + GROUP_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL + CLOSE_PROJECT_RATIO + SATISFACTION_RATIO) DESC,
+            (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC,
-            PARTY_TOTAL DESC,
+            rankData.PARTY_TOTAL DESC,
-            GROUP_TOTAL DESC,
+            rankData.GROUP_TOTAL DESC,
-            ISSUE_TOTAL DESC,
+            rankData.ISSUE_TOTAL DESC,
-            PROJECT_TOTAL DESC,
+            rankData.PROJECT_TOTAL DESC,
-            CLOSE_PROJECT_RATIO DESC,
+            rankData.CLOSE_PROJECT_RATIO DESC,
-            SATISFACTION_RATIO DESC
+            rankData.SATISFACTION_RATIO DESC
 
     </select>
 

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

@@ -15,5 +15,6 @@
         WHERE
             md.del_flag = '0'
             AND md.parent_id = #{agencyId}
+            AND ORG_TYPE = 'agency'
     </select>
 </mapper>

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

@@ -6,24 +6,29 @@
     <!-- 查询公众参与各类总数 -->
     <select id="selectPublicPartiTotal" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
         SELECT
-            ORG_NAME AS NAME,
+            totalData.ORG_NAME AS NAME,
-            REG_USER_TOTAL AS regNum,
+            totalData.REG_USER_TOTAL AS regNum,
-            JOIN_USER_TOTAL AS joinNum,
+            totalData.JOIN_USER_TOTAL AS joinNum,
-            TOPIC_TOTAL AS topicNum,
+            totalData.TOPIC_TOTAL AS topicNum,
-            ISSUE_TOTAL AS issueNum,
+            totalData.ISSUE_TOTAL AS issueNum,
-            PROJECT_TOTAL AS projectNum
+            totalData.PROJECT_TOTAL AS projectNum,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-                screen_public_parti_total_data
+                screen_public_parti_total_data totalData
+         LEFT JOIN
+                screen_customer_agency agency
+                ON totalData.PARENT_ID = agency.AGENCY_ID
+                AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
-                DEL_FLAG = '0'
+                totalData.DEL_FLAG = '0'
-                AND PARENT_ID =  #{agencyId}
+                AND totalData.PARENT_ID =  #{agencyId}
          ORDER BY
-         (REG_USER_TOTAL + JOIN_USER_TOTAL + TOPIC_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL) DESC,
+         (totalData.REG_USER_TOTAL + totalData.JOIN_USER_TOTAL + totalData.TOPIC_TOTAL + totalData.ISSUE_TOTAL + totalData.PROJECT_TOTAL) DESC,
-                REG_USER_TOTAL desc,
+                totalData.REG_USER_TOTAL desc,
-                JOIN_USER_TOTAL desc,
+                totalData.JOIN_USER_TOTAL desc,
-                TOPIC_TOTAL desc,
+                totalData.TOPIC_TOTAL desc,
-                ISSUE_TOTAL desc,
+                totalData.ISSUE_TOTAL desc,
-                PROJECT_TOTAL desc
+                totalData.PROJECT_TOTAL desc
     </select>
 
 </mapper>