巡检模块代码bug修改 && 机场代码迁移

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2873,7 +2873,7 @@
         LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
 
         <where>
-
+            and wec.industry_code = 2
         <if test="dto.code!=null and dto.code!=''">
             and wesp.code = #{dto.code}
         </if>

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -75,7 +75,9 @@
             LEFT JOIN ( SELECT check_id, GROUP_CONCAT( latent_danger_id ) dangerIds FROM p_latent_danger_patrol GROUP BY check_id ) t ON t.check_id = a.id
         </if>
         <trim prefix="WHERE" prefixOverrides="AND ">
-            <if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>
+<!--            <if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>-->
+            <if test="beginDate!=null and beginDate!= ''">and a.check_time >= #{beginDate} </if>
+            <if test="endDate!=null and endDate!= ''">and  #{endDate} >= a.check_time</if>
             <!-- <if test="endDate!=null"> and #{endDate} <![CDATA[>=]]> a.check_time  </if> -->
             <if test="userName!=null">and a.user_name like concat(concat("%",#{userName}),"%")</if>
             <if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>
@@ -257,7 +259,9 @@
             LEFT JOIN ( SELECT check_id, GROUP_CONCAT( latent_danger_id ) dangerIds FROM p_latent_danger_patrol GROUP BY check_id ) t ON t.check_id = a.id
         </if>
         <trim prefix="WHERE" prefixOverrides="AND ">
-            <if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>
+<!--            <if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>-->
+            <if test="beginDate!=null and beginDate!= ''">and a.check_time >= #{beginDate} </if>
+            <if test="endDate!=null and endDate!= ''">and  #{endDate} >= a.check_time</if>
             <!-- <if test="endDate!=null"> and #{endDate} <![CDATA[>=]]> a.check_time  </if> -->
             <if test="userName!=null">and a.user_name like concat(concat("%",#{userName}),"%")</if>
             <if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -1315,6 +1315,7 @@
 			and ( select  COUNT(p_point_inputitem.id) fROM p_point_inputitem where  p_point_inputitem.point_id =pp.id) >0
 			AND pp.is_delete = 0
 		</where>
+		order by pp.create_date DESC
 		LIMIT #{offset}, #{size}
 	</select>
 

amos-boot-system-patrol/src/main/resources/db/mapper/routeMapper.xml

@@ -458,6 +458,7 @@
 		WHERE
 			r.is_delete = 0 and r.biz_org_code like CONCAT( #{orgCode}, '%')
 		GROUP BY r.id
+		order by r.create_date DESC
 	</select>