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

app检查表记录清单排查列表显示空的消防点位

0927cmt
songwenxuan 2024-05-10 17:01:15 +08:00
parent 3dc5aac3ac
commit fb2c461dd2
2 changed files with 149 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
View File

@ -25,9 +25,15 @@
<update id="upd4PcById" parameterType="pd">
UPDATE bus_fire_checklist
SET FIRE_CHECK_STANDARD_NAME = #{FIRE_CHECK_STANDARD_NAME},
FIRE_CHECK_TYPE = #{FIRE_CHECK_TYPE},
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
FIRE_CHECK_TYPE = #{FIRE_CHECK_TYPE},
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
,DEPARTMENT_ID = #{DEPARTMENT_ID}
</if>
<if test="USER_ID != null and USER_ID != ''">
,USER_ID = #{USER_ID}
</if>
WHERE FIRE_CHECK_ID = #{FIRE_CHECK_ID}
</update>
<update id="delByIds" parameterType="pd">
@ -64,14 +70,15 @@
cl.FIRE_CHECK_STANDARD_NAME,
cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID,
IFNULL( FINISHED, 0 ) FINISHED,
od.`NAME` AS DEPARTMENTNAME,
d.`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
bus_fire_checklist AS cl
left JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID
LEFT JOIN (
SELECT
FIRE_CHECK_ID,
@ -85,8 +92,6 @@
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
@ -95,7 +100,7 @@
</if>
<if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
<choose>
<!--公司领导-->
<!--公司领导-->
<when test='pd.roleLevel == "0"'>
and cl.CORPINFO_ID = #{pd.CORPINFO_ID}
</when>
@ -167,7 +172,7 @@
oa_department AS oa
ON
su.DEPARTMENT_ID = oa.DEPARTMENT_ID
INNER JOIN
LEFT JOIN
sys_post AS sp
ON
su.POST_ID = sp.POST_ID
@ -223,13 +228,19 @@
fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
WHERE
fp.ISDELETE = 0 AND
fd.ISDELETE = 0
fd.ISDELETE = 0 AND fr.ISDELETE = 0
<if test="USER_ID != null and USER_ID != ''">
and fp.USER_ID = #{USER_ID}
</if>
<if test="USERNAME != null and USERNAME != ''">
and su.NAME like concat(#{USERNAME},'%')
</if>
<if test="departmentIds != null and departmentIds != ''">
and fp.DEPARTMENT_ID in
<foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
and fp.DEPARTMENT_ID = #{DEPARTMENT_ID}
</if>
@ -326,21 +337,26 @@
<select id="getFireCheckListByApplistPageV2" resultType="com.zcloud.entity.PageData">
SELECT cl.FIRE_CHECK_ID,
cl.FIRE_CHECK_STANDARD_NAME,
cl.FIRE_CHECK_TYPE,
COUNT( DISTINCT fpp.FIRE_POINT_ID ) AS ITEMCOUNT,
su.`NAME` AS USERNAME,
od.`NAME` AS DEPARTMENT,
sys_dictionaries.`NAME` BIANMA
FROM bus_fire_checklist AS cl
LEFT JOIN bus_fire_device_prepared AS fpc ON cl.FIRE_CHECK_ID = fpc.FIRE_CHECK_ID
LEFT JOIN bus_fire_point_prepared fpp on cl.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
LEFT JOIN oa_department AS od ON cl.DEPARTMENT_ID = od.DEPARTMENT_ID
LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
cl.FIRE_CHECK_STANDARD_NAME,
cl.FIRE_CHECK_TYPE,
COUNT( DISTINCT fpp.FIRE_POINT_ID ) AS ITEMCOUNT,
su.`NAME` AS USERNAME,
od.`NAME` AS DEPARTMENT,
sys_dictionaries.`NAME` BIANMA
FROM bus_fire_checklist AS cl
LEFT JOIN bus_fire_device_prepared AS fpc ON cl.FIRE_CHECK_ID = fpc.FIRE_CHECK_ID
LEFT JOIN bus_fire_point_prepared fpp on cl.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
LEFT JOIN oa_department AS od ON cl.DEPARTMENT_ID = od.DEPARTMENT_ID
LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
WHERE cl.ISDELETE = 0
AND cl.STATE = 0
AND cl.STATE = 0
<if test="pd.pointId != null and pd.pointId != ''">
AND fpp.FIRE_POINT_ID = #{pd.pointId}
</if>
and fpp.ISDELETE = 0
and fp.ISDELETE = 0
AND fpc.ISDELETE = 0
<if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
<choose>
@ -379,7 +395,7 @@
and PHONE_REPEAT = #{PHONE_REPEAT}
and FIRE_CHECK_ID = #{FIRE_CHECK_ID}
ORDER BY OPERATTIME desc
LIMIT 1
LIMIT 1
</select>
<select id="getNotCheckedByWEEK" resultType="com.zcloud.entity.PageData">
SELECT f.FIRE_CHECK_ID,
@ -432,9 +448,9 @@
AND cl.CORPINFO_ID = #{CORPINFO_ID,jdbcType=VARCHAR}
</if>
</if>
<if test="roleLevel == '1'.toString()">
and cl.DEPARTMENT_ID in (${supDeparIds})
</if>
<if test="roleLevel == '1'.toString()">
and cl.DEPARTMENT_ID in (${supDeparIds})
</if>
<if test="roleLevel == '2'.toString()">
<if test="USER_ID != null and USER_ID != ''">
AND cl.USER_ID = #{USER_ID}
@ -459,7 +475,7 @@
WHERE cl.ISDELETE = 0
AND cl.STATE = 0
<if test="USER_ID != null and USER_ID != ''">
and cl.USER_ID = #{USER_ID}
and cl.USER_ID = #{USER_ID}
</if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND cl.CORPINFO_ID = #{CORPINFO_ID,jdbcType=VARCHAR}

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

@ -54,7 +54,7 @@
<insert id="additionRecord" parameterType="list">
INSERT INTO `qa-cmt-prevention`.`bus_fire_record`
(`FIRE_RECORD_ID`, `FIRE_CHECK_ID`, `CORPINFO_ID`, `CREATOR`, `CREATTIME`,REPEATCHECK,
`OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`) VALUES
`OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`, `PHONE_REPEAT`) VALUES
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.FIRE_RECORD_ID},
@ -66,7 +66,8 @@
#{item.OPERATOR},
#{item.OPERATTIME},
#{item.PERIODSTART},
#{item.PERIODEND}
#{item.PERIODEND},
#{item.PHONE_REPEAT}
)
</foreach>
</insert>
@ -117,16 +118,16 @@
<insert id="additionRecordPointByApp">
INSERT INTO bus_fire_record_point
(
EQUIPMENT_POINT_ID,
FIRE_CHECK_ID,
FIRE_RECORD_ID,
FIRE_POINT_ID,
CORPINFO_ID,
P_ISCHECKED,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME) VALUES
EQUIPMENT_POINT_ID,
FIRE_CHECK_ID,
FIRE_RECORD_ID,
FIRE_POINT_ID,
CORPINFO_ID,
P_ISCHECKED,
CREATOR,
CREATTIME,
OPERATOR,
OPERATTIME) VALUES
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.EQUIPMENT_POINT_ID},
@ -334,14 +335,14 @@
<update id="updCheckedByRidPid">
UPDATE bus_fire_record_point
SET `P_ISCHECKED` = 1,
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
WHERE
FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and FIRE_POINT_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and FIRE_POINT_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<update id="doRemoveRecordDeviceHiddenByCidRidDid">
UPDATE `qa-cmt-prevention`.`bus_fire_record_device`
@ -379,7 +380,7 @@
INNER JOIN bus_fire_point AS bfp ON bfd.FIRE_POINT_ID = bfp.FIRE_POINT_ID
INNER JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
INNER JOIN oa_department AS oa ON su.DEPARTMENT_ID = oa.DEPARTMENT_ID
INNER JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID
LEFT JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID
INNER JOIN bus_fire_region AS bfr ON bfp.FIRE_REGION_ID = bfr.FIRE_REGION_ID
INNER JOIN bus_fire_record AS fr ON cl.FIRE_CHECK_ID = fr.FIRE_CHECK_ID
WHERE cl.ISDELETE = 0
@ -569,38 +570,38 @@
</select>
<select id="goCheckByApp" resultType="com.zcloud.entity.PageData">
SELECT
bus_fire_record.FIRE_RECORD_ID,
bus_fire_record.FINISHED,
bus_fire_record.HIDDENIDLIST,
bus_fire_record_device.HIDDEN_ID,
bus_fire_record_device.HIDDENDESCR,
bus_fire_record_device.EQUIPMENT_RECORD_ID,
bus_fire_record_device.FIRE_DEVICE_ID,
bus_fire_record.FIRE_CHECK_ID,
bus_fire_record.PERIODSTART,
bus_fire_record.PERIODEND,
bus_fire_record.CHECK_TIME,
bus_fire_record.REASON,
bus_fire_record.CHECK_USERS,
bus_fire_record.DEPARTMENT_ID,
bus_fire_region.FIRE_REGION_NAME,
bus_fire_point.FIRE_POINT_NAME,
bus_fire_device.FIRE_DEVICE_CODE,
bus_fire_record_device.ISCHECKED,
bus_fire_record_device.ISNORMAL,
bus_fire_device_prepared.HASHIDDEN,
bus_fire_device_prepared.FIRE_CHECK_STANDARD_ID,
bus_fire_device_prepared.FIRE_PREPARED_ID,
dic.NAME as dicName,
bus_fire_device.FIRE_DEVICE_TYPE_ID AS FIRE_DEVICE_TYPE_ID
bus_fire_record.FIRE_RECORD_ID,
bus_fire_record.FINISHED,
bus_fire_record.HIDDENIDLIST,
bus_fire_record_device.HIDDEN_ID,
bus_fire_record_device.HIDDENDESCR,
bus_fire_record_device.EQUIPMENT_RECORD_ID,
bus_fire_record_device.FIRE_DEVICE_ID,
bus_fire_record.FIRE_CHECK_ID,
bus_fire_record.PERIODSTART,
bus_fire_record.PERIODEND,
bus_fire_record.CHECK_TIME,
bus_fire_record.REASON,
bus_fire_record.CHECK_USERS,
bus_fire_record.DEPARTMENT_ID,
bus_fire_region.FIRE_REGION_NAME,
bus_fire_point.FIRE_POINT_NAME,
bus_fire_device.FIRE_DEVICE_CODE,
bus_fire_record_device.ISCHECKED,
bus_fire_record_device.ISNORMAL,
bus_fire_device_prepared.HASHIDDEN,
bus_fire_device_prepared.FIRE_CHECK_STANDARD_ID,
bus_fire_device_prepared.FIRE_PREPARED_ID,
dic.NAME as dicName,
bus_fire_device.FIRE_DEVICE_TYPE_ID AS FIRE_DEVICE_TYPE_ID
FROM bus_fire_record
RIGHT JOIN bus_fire_record_device ON bus_fire_record.FIRE_RECORD_ID = bus_fire_record_device.FIRE_RECORD_ID
INNER JOIN bus_fire_device ON bus_fire_record_device.FIRE_DEVICE_ID = bus_fire_device.FIRE_DEVICE_ID
INNER JOIN bus_fire_point ON bus_fire_device.FIRE_POINT_ID = bus_fire_point.FIRE_POINT_ID
INNER JOIN bus_fire_region ON bus_fire_device.FIRE_REGION_ID = bus_fire_region.FIRE_REGION_ID
CROSS JOIN bus_fire_checklist
left JOIN bus_fire_device_prepared ON bus_fire_device_prepared.FIRE_CHECK_ID = bus_fire_record.FIRE_CHECK_ID
LEFT JOIN sys_dictionaries dic ON dic.BIANMA = bus_fire_device.FIRE_DEVICE_TYPE_ID
RIGHT JOIN bus_fire_record_device ON bus_fire_record.FIRE_RECORD_ID = bus_fire_record_device.FIRE_RECORD_ID
INNER JOIN bus_fire_device ON bus_fire_record_device.FIRE_DEVICE_ID = bus_fire_device.FIRE_DEVICE_ID
INNER JOIN bus_fire_point ON bus_fire_device.FIRE_POINT_ID = bus_fire_point.FIRE_POINT_ID
INNER JOIN bus_fire_region ON bus_fire_device.FIRE_REGION_ID = bus_fire_region.FIRE_REGION_ID
CROSS JOIN bus_fire_checklist
left JOIN bus_fire_device_prepared ON bus_fire_device_prepared.FIRE_CHECK_ID = bus_fire_record.FIRE_CHECK_ID
LEFT JOIN sys_dictionaries dic ON dic.BIANMA = bus_fire_device.FIRE_DEVICE_TYPE_ID
WHERE bus_fire_record.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and bus_fire_checklist.USER_ID = #{USER_ID}
AND bus_fire_record.ISDELETE = 0
@ -647,9 +648,9 @@
ON
bus_fire_record_device.FIRE_CHECK_STANDARD_ID = bus_fire_check_standard.FIRE_CHECK_STANDARD_ID
WHERE
bus_fire_record_device.EQUIPMENT_RECORD_ID = #{EQUIPMENT_RECORD_ID} AND
bus_fire_record_device.EQUIPMENT_RECORD_ID = #{EQUIPMENT_RECORD_ID} AND
-- bus_fire_record_device.FIRE_CHECK_STANDARD_ID = #{FIRE_CHECK_STANDARD_ID} AND
bus_fire_record_device.FIRE_DEVICE_ID = #{FIRE_DEVICE_ID} AND
bus_fire_record_device.FIRE_DEVICE_ID = #{FIRE_DEVICE_ID} AND
bus_fire_device_prepared.FIRE_PREPARED_ID = #{FIRE_PREPARED_ID}
</select>
<select id="goRecordDeviceByRecordId" resultType="com.zcloud.entity.PageData">
@ -662,8 +663,8 @@
left join bus_fire_record fr on fr.FIRE_RECORD_ID = f.FIRE_RECORD_ID
LEFT JOIN bus_fire_device_prepared frd ON frd.FIRE_CHECK_ID = fr.FIRE_CHECK_ID and frd.FIRE_DEVICE_ID = f.FIRE_DEVICE_ID
WHERE 1 = 1
AND f.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and f.FIRE_DEVICE_ID = #{FIRE_DEVICE_ID}
AND f.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and f.FIRE_DEVICE_ID = #{FIRE_DEVICE_ID}
group by f.FIRE_DEVICE_ID
</select>
<select id="getAppRiskByPoint" resultType="com.zcloud.entity.PageData">
@ -711,6 +712,7 @@
and frc.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
AND frp.ISDELETE = 0
AND fpp.ISDELETE = 0
AND t.FIRE_POINT_ID IS NOT NULL
order by t.FIRE_POINT_NAME
</select>
<select id="getRecordDeviceByEid" resultType="com.zcloud.entity.PageData">
@ -786,46 +788,46 @@
</select>
<select id="getCheckRecordByPid" resultType="com.zcloud.entity.PageData">
SELECT
frp.EQUIPMENT_POINT_ID,
fc.FIRE_CHECK_STANDARD_NAME,
fc.FIRE_CHECK_TYPE,
u.`NAME` USERNAME,
dep.`NAME` deptName,
d.`NAME` dicName,
fpp.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID,
fp.FIRE_POINT_NAME,
reg.FIRE_REGION_NAME,
fpp.FIRE_POINT_ID,
fr.CHECK_TIME,
fr.PERIODSTART,
fr.PERIODEND
frp.EQUIPMENT_POINT_ID,
fc.FIRE_CHECK_STANDARD_NAME,
fc.FIRE_CHECK_TYPE,
u.`NAME` USERNAME,
dep.`NAME` deptName,
d.`NAME` dicName,
fpp.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID,
fp.FIRE_POINT_NAME,
reg.FIRE_REGION_NAME,
fpp.FIRE_POINT_ID,
fr.CHECK_TIME,
fr.PERIODSTART,
fr.PERIODEND
FROM
bus_fire_record fr
LEFT JOIN `bus_fire_point_prepared` fpp ON fr.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN bus_fire_checklist fc ON fpp.FIRE_CHECK_ID = fc.FIRE_CHECK_ID
LEFT JOIN sys_dictionaries d ON fc.FIRE_CHECK_TYPE = d.BIANMA
LEFT JOIN sys_user u ON fc.USER_ID = u.USER_ID
LEFT JOIN bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
LEFT JOIN bus_fire_region reg ON reg.FIRE_REGION_ID = fp.FIRE_REGION_ID
LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = fc.DEPARTMENT_ID
LEFT JOIN bus_fire_record_point frp ON fr.FIRE_RECORD_ID = frp.FIRE_RECORD_ID AND fp.FIRE_POINT_ID = frp.FIRE_POINT_ID
bus_fire_record fr
LEFT JOIN `bus_fire_point_prepared` fpp ON fr.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN bus_fire_checklist fc ON fpp.FIRE_CHECK_ID = fc.FIRE_CHECK_ID
LEFT JOIN sys_dictionaries d ON fc.FIRE_CHECK_TYPE = d.BIANMA
LEFT JOIN sys_user u ON fc.USER_ID = u.USER_ID
LEFT JOIN bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
LEFT JOIN bus_fire_region reg ON reg.FIRE_REGION_ID = fp.FIRE_REGION_ID
LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = fc.DEPARTMENT_ID
LEFT JOIN bus_fire_record_point frp ON fr.FIRE_RECORD_ID = frp.FIRE_RECORD_ID AND fp.FIRE_POINT_ID = frp.FIRE_POINT_ID
WHERE
fr.FINISHED = 1
and fc.ISDELETE = 0
and frp.ISDELETE = 0
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''" >
AND fpp.FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
fr.FINISHED = 1
and fc.ISDELETE = 0
and frp.ISDELETE = 0
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''" >
AND fpp.FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
<if test="KEYWORDS != null and KEYWORDS != ''" >
AND fc.FIRE_CHECK_STANDARD_NAME like concat('%',concat(#{KEYWORDS},'%'))
</if>
GROUP BY
fr.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID
fr.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID
ORDER BY
fr.OPERATTIME DESC
fr.OPERATTIME DESC
</select>
<select id="datalistPageV2" resultType="com.zcloud.entity.PageData">
SELECT
@ -887,7 +889,7 @@
</if>
<if test="pd.STATUS != null and pd.STATUS == '1'.toString()">
and temp.FINISHED is not null
-- AND CONCAT( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' ), ' 00:00:00' ) BETWEEN fr.PERIODSTART AND fr.PERIODEND
-- AND CONCAT( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' ), ' 00:00:00' ) BETWEEN fr.PERIODSTART AND fr.PERIODEND
</if>
<if test="pd.OVERTIME != null and pd.OVERTIME != ''">and fr.SUPPLEMENTARY = #{pd.OVERTIME}</if>
<if test="pd.USERNAME != null and pd.USERNAME !=''">and su.NAME like concat(#{pd.USERNAME},'%')</if>
@ -897,7 +899,7 @@
GROUP BY
FIRE_CHECK_ID
order by temp.FINISHED,fr. CREATTIME
order by fr. CREATTIME
</select>
<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
@ -952,7 +954,7 @@
AND frd.FIRE_RECORD_ID = frp.FIRE_RECORD_ID
LEFT JOIN bus_fire_region fr ON fp.FIRE_REGION_ID = fr.FIRE_REGION_ID
where frp.ISDELETE = 0
and frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
and frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
GROUP BY
frd.FIRE_RECORD_ID,
fd.FIRE_POINT_ID
@ -1016,4 +1018,18 @@
bus_fire_device_prepared where HIDDEN_ID = #{HIDDEN_ID} and ISDELETE = 0 order by OPERATTIME desc limit 1
</select>
<select id="getPhotoUploadMethod" resultType="com.zcloud.entity.PageData">
SELECT
fr.PHOTO_UPLOAD_METHOD
FROM
bus_fire_record_point frp
LEFT JOIN bus_fire_point fp ON frp.FIRE_POINT_ID = fp.FIRE_POINT_ID
AND fp.ISDELETE = '0'
LEFT JOIN bus_fire_region fr ON fr.FIRE_REGION_ID = fp.FIRE_REGION_ID
AND fr.ISDELETE = '0'
WHERE
frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID}
AND frp.ISDELETE = '0'
</select>
</mapper>