任务 13675

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

@@ -81,7 +81,7 @@
 			c.point_id,
 			c.point_name,
 			c.check_time,
-			pt.end_time AS `date`,
+			null AS `date`,
 			c.plan_id,
 			c.plan_name,
 			c.route_id,

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

@@ -83,7 +83,7 @@
             <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="isOK!=null">and a.is_OK = #{isOK}</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>