修改泡沫罐液位报警问题及巡检点列表显示异常问题

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

@@ -5137,7 +5137,7 @@
                 (
                         max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END ) = ''
                         OR max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END ) IS NULL,
-                        0,
+                        1000,
                         max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END )) AS maxValues
         FROM
             wl_form_instance_equip fi
@@ -5158,7 +5158,7 @@
                         max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) = ''
                         OR max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) IS NULL
                         OR max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) = 'null',
-                        0,
+                        1000,
                         max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END )) AS maxValues
         FROM
             wl_form_instance_equip fi

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

@@ -212,7 +212,7 @@
         a.id,
         a.org_code,
         a.point_id pointId,
-        b.name point_name,
+        a.point_name,
         b.is_fixed,
         b.point_no pointNo,
         a.user_id,
@@ -249,7 +249,7 @@
         END
         ) as is_ok,
         a.score,
-        d.`name` AS `route_name`,
+        a.`route_name`,
         (
         CASE
         WHEN  a.check_mode = 'QR'
@@ -287,19 +287,19 @@
             <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>
-            <if test="pointNo!=null">and b.point_no like concat('%',#{pointNo},'%')</if>
-            <if test="isFixed!=null">and b.is_fixed = #{isFixed}</if>
+            <if test="userName!=null and userName!=''">and a.user_name like concat(concat("%",#{userName}),"%")</if>
+            <if test="pointName!=null and pointName!= ''">and b.name like concat(concat("%",#{pointName}),"%")</if>
+            <if test="pointNo!=null and pointNo!=''">and b.point_no like concat('%',#{pointNo},'%')</if>
+            <if test="isFixed!=null and isFixed!=''">and b.is_fixed = #{isFixed}</if>
             <if test="isOK!=null and isOK!=''">and a.is_OK = #{isOK}</if>
-            <if test="planId!=null">and a.plan_Id = #{planId}</if>
-            <if test="planTaskId!=null">and a.plan_task_id = #{planTaskId}</if>
-            <if test="userId!=null">and find_in_set(#{userId}, a.user_id) > 0</if>
-            <if test="routeId!=null">and a.route_Id = #{routeId}</if>
-            <if test="catalogId!=null">and b.Catalog_Id = #{catalogId}</if>
-            <if test="orgCode!=null">and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
-            <if test="pointId!=null">and a.point_id = #{pointId}</if>
-            <if test="checkTime!=null">and TO_DAYS(a.check_time) = TO_DAYS('${checkTime}')</if>
+            <if test="planId!=null and planId!='' ">and a.plan_Id = #{planId}</if>
+            <if test="planTaskId!=null and planTaskId!=''">and a.plan_task_id = #{planTaskId}</if>
+            <if test="userId!=null and userId!=''">and find_in_set(#{userId}, a.user_id) > 0</if>
+            <if test="routeId!=null and routeId!=''">and a.route_Id = #{routeId}</if>
+            <if test="catalogId!=null and catalogId!=''">and b.Catalog_Id = #{catalogId}</if>
+            <if test="orgCode!=null and orgCode!=''">and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
+            <if test="pointId!=null and pointId!=''">and a.point_id = #{pointId}</if>
+            <if test="checkTime!=null and checkTime!=''">and TO_DAYS(a.check_time) = TO_DAYS('${checkTime}')</if>
             <if test="departmentId!=null and departmentId!='-1'"> and find_in_set(#{departmentId}, a.dep_id) > 0</if>
             <if test="checkType == '计划检查'">and a.plan_task_id &gt; 0</if>
             <if test="checkType == '无计划检查'">and a.plan_task_id &lt;= 0</if>