guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

消防功能优化

0927cmt
zhaoyu 2024-05-07 14:36:02 +08:00
parent 7806353850
commit 9dd87ae260
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
View File

@ -115,7 +115,8 @@
IFNULL( t.DEVICE_COUNT, 0 ) DEVICE_COUNT, IFNULL( t.DEVICE_COUNT, 0 ) DEVICE_COUNT,
d.`NAME` AS DEPARTMENT_NAME, d.`NAME` AS DEPARTMENT_NAME,
u.`NAME` AS USERNAME, u.`NAME` AS USERNAME,
r.FIRE_REGION_NAME r.FIRE_REGION_NAME,
fp.FIRE_POINT_ID as POINT
FROM FROM
bus_fire_point AS p bus_fire_point AS p
LEFT JOIN bus_fire_qualified_photos fqp ON p.QUALIFIED_PHOTOS_ID = fqp.QUALIFIED_PHOTOS_ID LEFT JOIN bus_fire_qualified_photos fqp ON p.QUALIFIED_PHOTOS_ID = fqp.QUALIFIED_PHOTOS_ID
@ -123,6 +124,13 @@
LEFT JOIN ( SELECT count( FIRE_DEVICE_ID ) DEVICE_COUNT, FIRE_POINT_ID FROM bus_fire_device WHERE ISDELETE = 0 GROUP BY FIRE_POINT_ID ) t ON t.FIRE_POINT_ID = p.FIRE_POINT_ID LEFT JOIN ( SELECT count( FIRE_DEVICE_ID ) DEVICE_COUNT, FIRE_POINT_ID FROM bus_fire_device WHERE ISDELETE = 0 GROUP BY FIRE_POINT_ID ) t ON t.FIRE_POINT_ID = p.FIRE_POINT_ID
LEFT JOIN sys_user AS u ON p.USER_ID = u.USER_ID LEFT JOIN sys_user AS u ON p.USER_ID = u.USER_ID
LEFT JOIN oa_department AS d ON p.DEPARTMENT_ID = d.DEPARTMENT_ID LEFT JOIN oa_department AS d ON p.DEPARTMENT_ID = d.DEPARTMENT_ID
LEFT JOIN (SELECT DISTINCT
f.FIRE_POINT_ID
FROM
`bus_fire_device` f
LEFT JOIN bus_fire_device_prepared p ON f.FIRE_DEVICE_ID = p.FIRE_DEVICE_ID
WHERE
f.ISDELETE = '0') fp on fp.FIRE_POINT_ID = p.FIRE_POINT_ID
WHERE WHERE
r.CORPINFO_ID = #{pd.CORPINFO_ID} r.CORPINFO_ID = #{pd.CORPINFO_ID}
AND r.ISDELETE = 0 AND r.ISDELETE = 0

2
src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
View File

@ -897,7 +897,7 @@
GROUP BY GROUP BY
FIRE_CHECK_ID FIRE_CHECK_ID
order by fr. CREATTIME order by temp.FINISHED,fr. CREATTIME
</select> </select>
<select id="getCheckingByCid" resultType="com.zcloud.entity.PageData"> <select id="getCheckingByCid" resultType="com.zcloud.entity.PageData">
select * from bus_fire_record where FIRE_CHECK_ID = #{FIRE_CHECK_ID} and ISDELETE = 0 and PHONE_REPEAT = 1 select * from bus_fire_record where FIRE_CHECK_ID = #{FIRE_CHECK_ID} and ISDELETE = 0 and PHONE_REPEAT = 1