指标统计时不统计平阴县，基础信息录入时榆山pid改为0

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml

@@ -311,7 +311,7 @@
                           AND NEWS_UP_DOWN_STATE = '0'
                           AND date_format(CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR}
                     GROUP BY DEPT_ID)news on news.DEPT_ID=d.id
-        WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party')
+        WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party')
             AND d.DEL_FLAG=0
             AND d.id NOT IN (
                 SELECT t.DEPT_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t WHERE t.DEL_FLAG  = '0'
@@ -413,7 +413,7 @@
             AND sd.id NOT IN (
               SELECT t.DEPT_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t WHERE t.DEL_FLAG  = '0'
             )
-            AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party' OR sd.TYPE_KEY = 'district_party')
+            AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party')
     </select>
 
     <select id="selectListGridGovrnAbility" resultType="com.elink.esua.epdc.dto.screen.result.GridGovrnAbilityDTO">
@@ -550,7 +550,7 @@
               left join <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE
               group by t.DEPT_ID
         )tr on tr.DEPT_ID=d.id
-        WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party')
+        WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party')
         and d.DEL_FLAG = '0'
         and d.id not in (
             SELECT t.DEPT_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t WHERE t.DEL_FLAG  = '0'

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml

@@ -6,8 +6,8 @@
     <select id="customerAgency" resultType="com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO">
         SELECT sd.`id` AS agencyId,
                sd.`name` AS agencyName,
-               sd.`pid` AS pid,
-               sd.`pids` AS pids,
+        (CASE WHEN sd.type_key = 'street_party' THEN 0 ELSE sd.`pid` END) AS pid,
+        (CASE WHEN sd.type_key = 'street_party' THEN 0 ELSE sd.`pids` END) AS pids,
                CASE WHEN sd2.`name` IS NULL
            AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames,
                  '' AS areaMarks,
@@ -20,7 +20,7 @@
           LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept` sd1 ON sd1.`id`= sd.`pid`
           LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept` sd2 ON sd2.`id`= sd1.`pid`
          WHERE sd.`del_flag`= 0
-           AND sd.`type_key`IN('community_party', 'district_party', 'street_party')
+           AND sd.`type_key`IN('community_party', 'street_party')
            AND sd.`id` NOT IN(
         SELECT t.`dept_id`
           FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t