Merge branch 'limingyu-2024-04-16-消防点位维护新增是否标点' into pet

src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml

@@ -228,7 +228,7 @@
         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>

src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml

@@ -144,7 +144,8 @@
         IFNULL( t.DEVICE_COUNT, 0 ) DEVICE_COUNT,
         d.`NAME` AS DEPARTMENT_NAME,
         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
         bus_fire_point AS p
         LEFT JOIN bus_fire_qualified_photos fqp ON p.QUALIFIED_PHOTOS_ID = fqp.QUALIFIED_PHOTOS_ID
@@ -165,6 +166,12 @@
         <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
             AND p.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
         </if>
+        <if test="pd.FIRE_REGION_ID != null and pd.FIRE_REGION_ID != ''">
+            AND p.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
+        </if>
+        <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}
+        </if>
         group by p.FIRE_POINT_ID
         ORDER BY
         p.OPERATTIME desc