From c9dfeacbf09c9fdfc9d6920384db4dfc0df323a2 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 22 Apr 2024 11:50:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E9=98=B2=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=A0=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/firemanager/FireCheckListMapper.xml  | 2 +-
 .../mybatis/datasource/firemanager/FirePonitMapper.xml      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
index f06ed085..eafe482d 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
+++ b/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>
diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
index 93edb838..1f1c4e6b 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
+++ b/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,9 @@
         <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>
         group by p.FIRE_POINT_ID
         ORDER BY
         p.OPERATTIME desc

From f20fc32ae16da4654c1780d87f42230bd18326e3 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 25 Apr 2024 16:46:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E9=98=B2=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E5=AD=97=E6=AE=B5=E5=92=8C=E6=98=AF=E5=90=A6=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/firemanager/FirePonitMapper.xml         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
index 1f1c4e6b..ef01c948 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
@@ -169,6 +169,9 @@
         <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