screen_index_data_monthly代码微调

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml

@@ -162,16 +162,16 @@
                  fics.year_id AS yearId,
                  ROUND(AVG( fics.score ),6) AS score,
                  fics.customer_id AS customerId,
-                 (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode}) AS parentId
+                 (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0) AS parentId
              FROM
                  fact_index_agency_score fics
              WHERE
                  fics.del_flag = '0'
                AND fics.month_id = #{monthId}
                AND fics.index_code = #{indexCode}
-               AND  fics.agency_id IN (SELECT AGENCY_ID FROM screen_customer_agency WHERE PARENT_AREA_CODE = #{areaCode})
+               AND  fics.agency_id IN (SELECT AGENCY_ID FROM screen_customer_agency WHERE PARENT_AREA_CODE = #{areaCode} AND DEL_FLAG = 0)
              GROUP BY agencyId) a
-                LEFT JOIN screen_customer_agency a2 ON a2.AGENCY_ID = a.parentId
+                LEFT JOIN screen_customer_agency a2 ON a2.AGENCY_ID = a.parentId AND a2.DEL_FLAG = 0
         GROUP BY a2.AGENCY_ID
     </select>