From 9986f6e3ea84845542c76f6fb0ffa17e4eb4de72 Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 15:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/firemanager/FireCheckListMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml index 9cd9898c..8cc7722d 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml @@ -64,15 +64,14 @@ cl.FIRE_CHECK_STANDARD_NAME, cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID, IFNULL( FINISHED, 0 ) FINISHED, - d.`NAME` AS DEPARTMENTNAME, + od.`NAME` AS DEPARTMENTNAME, su.`NAME` AS USERNAME, cl.STATE, sys_dictionaries.`NAME` AS FIRE_CHECK_TYPE, cl.FIRE_CHECK_ID, ifnull(tt.CHECK_NUM,0) CHECK_NUM FROM - bus_fire_checklist AS cl - left JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID + bus_fire_checklist as cl LEFT JOIN ( SELECT FIRE_CHECK_ID, @@ -86,6 +85,8 @@ AND CORPINFO_ID = #{pd.CORPINFO_ID} GROUP BY FIRE_CHECK_ID,PERIODSTART,PERIODEND ) AS t ON cl.FIRE_CHECK_ID = t.FIRE_CHECK_ID LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID + left join oa_department od + on od.DEPARTMENT_ID = su.DEPARTMENT_ID LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA LEFT JOIN (SELECT FIRE_CHECK_ID, count(1) CHECK_NUM from bus_fire_record GROUP BY FIRE_CHECK_ID ) tt on cl.FIRE_CHECK_ID = tt.FIRE_CHECK_ID where cl.ISDELETE = 0 and cl.STATE != 2