消防点位维护新增字段是否标点
parent
e3b1516b77
commit
c9dfeacbf0
|
@ -228,7 +228,7 @@
|
||||||
fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
|
fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
|
||||||
WHERE
|
WHERE
|
||||||
fp.ISDELETE = 0 AND
|
fp.ISDELETE = 0 AND
|
||||||
fd.ISDELETE = 0
|
fd.ISDELETE = 0 AND fr.ISDELETE = 0
|
||||||
<if test="USER_ID != null and USER_ID != ''">
|
<if test="USER_ID != null and USER_ID != ''">
|
||||||
and fp.USER_ID = #{USER_ID}
|
and fp.USER_ID = #{USER_ID}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
@ -144,7 +144,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,
|
||||||
|
if(p.LATITUDE is null or p.LONGITUDE is null, '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
|
||||||
|
@ -165,6 +166,9 @@
|
||||||
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
|
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
|
||||||
AND p.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
|
AND p.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="pd.FIRE_REGION_ID != null and pd.FIRE_REGION_ID != ''">
|
||||||
|
AND p.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
|
||||||
|
</if>
|
||||||
group by p.FIRE_POINT_ID
|
group by p.FIRE_POINT_ID
|
||||||
ORDER BY
|
ORDER BY
|
||||||
p.OPERATTIME desc
|
p.OPERATTIME desc
|
||||||
|
|
Loading…
Reference in New Issue