大屏治理能力榜单添加上级组织名称返参

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

@@ -39,4 +39,9 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 满意率
      * */
     private String satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }

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

@@ -39,4 +39,9 @@ public class GovernCapacityResultDTO implements Serializable {
      * 满意率
      * */
     private BigDecimal satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }

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

@@ -6,19 +6,23 @@
     <!-- 查询政府治理能力各项指标 -->
     <select id="selectGovernCapacityRatio" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
        SELECT
-            ORG_NAME AS agencyName,
-            RESPONSE_RATIO,
-            RESOLVED_RATIO,
-            GOVERN_RATIO,
-            SATISFACTION_RATIO
+            rankData.ORG_NAME AS agencyName,
+            rankData.RESPONSE_RATIO,
+            rankData.RESOLVED_RATIO,
+            rankData.GOVERN_RATIO,
+            rankData.SATISFACTION_RATIO,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_govern_rank_data
+            screen_govern_rank_data rankData
+        LEFT JOIN
+            screen_customer_agency agency
+            ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
-            DEL_FLAG = '0'
-            AND PARENT_ID = #{agencyId}
-            AND MONTH_ID = #{monthId}
+            rankData.DEL_FLAG = '0'
+            AND rankData.PARENT_ID = #{agencyId}
+            AND rankData.MONTH_ID = #{monthId}
         ORDER BY
-            (RESPONSE_RATIO + RESOLVED_RATIO + GOVERN_RATIO + SATISFACTION_RATIO) DESC,RESPONSE_RATIO DESC,RESOLVED_RATIO DESC,GOVERN_RATIO DESC,SATISFACTION_RATIO DESC
+            (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
     </select>
 
 </mapper>