Merge remote-tracking branch 'origin/pet' into pet

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

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

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'

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'