sql bug

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

@@ -401,15 +401,15 @@
         FROM
         esua_epdc_admin.sys_dept sd
         LEFT JOIN esua_epdc_events.epdc_issue eis ON sd.id = eis.GRID_ID
-        LEFT JOIN esua_epdc_events.epdc_item eit ON eit.ISSUE_ID = eis.ID
         AND eis.DEL_FLAG = '0'
         AND DATE_FORMAT(
-        eit.CREATED_TIME,
+        eis.CREATED_TIME,
         '%Y-%m-%d'
         ) <= DATE_FORMAT(
         date_add(now(), INTERVAL - 1 DAY),
         '%Y-%m-%d'
         )
+        LEFT JOIN esua_epdc_events.epdc_item eit ON eit.ISSUE_ID = eis.ID
         WHERE
         sd.del_flag = '0'
         AND sd.type_key = 'grid_party'
@@ -827,7 +827,7 @@
         ),
         '%Y'
         ) AS yearId,
-        sd.pid AS agencyId,
+        sd.id AS agencyId,
         IFNULL(COUNT(eu.ID), 0) AS regTotal,
         IFNULL(COUNT(eu.ID), 0) AS resiTotal,
         IFNULL(
@@ -932,7 +932,6 @@
         FROM
         esua_epdc_admin.sys_dept sd
         LEFT JOIN esua_epdc_user.epdc_user eu ON find_in_set(sd.`id`, eu.`ALL_DEPT_IDS`)
-        AND sd.id = eu.DEPT_ID
         AND eu.DEL_FLAG = '0'
         AND eu.STATE = '3'
         AND DATE_FORMAT(eu.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(