From b91fe23733f76afc86efc201a7273c812dd86abb Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 08:36:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?15164=20=E5=A2=9E=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20=E8=A6=81=E4=B8=8D=E5=A4=AA=E5=A4=9A=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
index f5abc175..5db2666c 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
@@ -146,6 +146,9 @@
         <if test="pd.FIRE_POINT_NAME != null and pd.FIRE_POINT_NAME !='' ">
             and fp.FIRE_POINT_NAME like concat('%',#{pd.FIRE_POINT_NAME},'%')
         </if>
+        <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+            and d.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+        </if>
         ORDER BY
         fr.FIRE_REGION_ID,fr.CREATTIME,fp.FIRE_POINT_ID,fp.CREATTIME,fd.FIRE_DEVICE_TYPE_ID,fd.CREATTIME, fd.OPERATTIME
         DESC

From 29f4e7df5e2efc0524aa3657a9a633a68a87d259 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 14:44:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8A=A8?=
 =?UTF-8?q?=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=88=A0=E9=99=A4=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84bug=EF=BC=8C=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=BB=B4=E6=8A=A4=E6=98=AF=E5=90=A6=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/firemanager/FirePonitMapper.xml        | 4 ++--
 .../datasource/highriskwork/BusHotworkCfdExamineMapper.xml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
index ef01c948..7ec95e23 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
@@ -145,7 +145,7 @@
         d.`NAME` AS DEPARTMENT_NAME,
         u.`NAME` AS USERNAME,
         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
         bus_fire_point AS p
         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}
         </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}
+            AND if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') = #{pd.IS_PUNCTUATION}
         </if>
         group by p.FIRE_POINT_ID
         ORDER BY
diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
index de8b0c81..b92b0544 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
@@ -132,6 +132,7 @@
 
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select * from bus_hotwork_cfd_examine f
+		where f.IS_DELETE = '0' and f.HOTWORK_ID = #{HOTWORK_ID}
 	</select>
 	<select id="findByCondition" resultType="com.zcloud.entity.PageData">
 		select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'

From 8d45dc15cdf55fff1033272b8491492519294b9c Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 15:15:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9Amq?=
 =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E6=97=B6=E4=BD=9C=E5=BA=9F=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/highriskwork/HotworkCfdMapper.xml   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
index 9fe98361..bb442595 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
@@ -383,7 +383,7 @@
 	</select>
 	<update id="editSpecialwork" parameterType = "pd">
 		update
-		bus_confinedspace f
+		gf_confinedspace f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -393,7 +393,7 @@
 	</update>
 	<update id="editSpecialwork1" parameterType = "pd">
 		update
-		bus_blindboard f
+		gf_blindboard f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -403,7 +403,7 @@
 	</update>
 	<update id="editSpecialwork2" parameterType = "pd">
 		update
-		bus_electricity f
+		gf_electricity f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -413,7 +413,7 @@
 	</update>
 	<update id="editSpecialwork3" parameterType = "pd">
 		update
-		bus_hoisting f
+		gf_hoisting f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -423,7 +423,7 @@
 	</update>
 	<update id="editSpecialwork4" parameterType = "pd">
 		update
-		bus_breakground f
+		gf_breakground f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -433,7 +433,7 @@
 	</update>
 	<update id="editSpecialwork5" parameterType = "pd">
 		update
-		bus_cutroad f
+		gf_cutroad f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'
@@ -443,7 +443,7 @@
 	</update>
 	<update id="editSpecialwork6" parameterType = "pd">
 		update
-		bus_highwork f
+		gf_highwork f
 		set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
 		WHERE
 		f.ISDELETE = '0'