企业端动火作业删除全部删除的bug,消防点位维护是否标点显示错误的bug
parent
b91fe23733
commit
29f4e7df5e
|
@ -145,7 +145,7 @@
|
||||||
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,
|
||||||
if(p.LATITUDE is null or p.LONGITUDE is null, '1', '0') AS ISPUNCTUATION
|
if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') AS ISPUNCTUATION
|
||||||
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
|
||||||
|
@ -170,7 +170,7 @@
|
||||||
AND p.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
|
AND p.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
|
||||||
</if>
|
</if>
|
||||||
<if test="pd.IS_PUNCTUATION != null and pd.IS_PUNCTUATION != ''">
|
<if test="pd.IS_PUNCTUATION != null and pd.IS_PUNCTUATION != ''">
|
||||||
AND if(p.LATITUDE is null or p.LONGITUDE is null, '1', '0') = #{pd.IS_PUNCTUATION}
|
AND if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') = #{pd.IS_PUNCTUATION}
|
||||||
</if>
|
</if>
|
||||||
group by p.FIRE_POINT_ID
|
group by p.FIRE_POINT_ID
|
||||||
ORDER BY
|
ORDER BY
|
||||||
|
|
|
@ -132,6 +132,7 @@
|
||||||
|
|
||||||
<select id="listAll" parameterType="pd" resultType="pd">
|
<select id="listAll" parameterType="pd" resultType="pd">
|
||||||
select * from bus_hotwork_cfd_examine f
|
select * from bus_hotwork_cfd_examine f
|
||||||
|
where f.IS_DELETE = '0' and f.HOTWORK_ID = #{HOTWORK_ID}
|
||||||
</select>
|
</select>
|
||||||
<select id="findByCondition" resultType="com.zcloud.entity.PageData">
|
<select id="findByCondition" resultType="com.zcloud.entity.PageData">
|
||||||
select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'
|
select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'
|
||||||
|
|
Loading…
Reference in New Issue