From 8e486a8452f25ac2ea4b473ca9496e9704479d69 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Tue, 15 Oct 2024 16:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=80=83=E6=A0=B8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=B7=B2=E5=8A=9E=E6=A0=B9=E6=8D=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java  | 4 ++--
 .../gunshi/project/xyt/mapper/InspectTaskDetailMapper.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
index 2f5250c..37f1789 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
@@ -38,7 +38,7 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
                  and status in (1,9) 
                 )
                 <if test="obj.taskName != null and obj.taskName != ''">
-                    and t.task_name like concat('%', #{obj.taskName}, '%')
+                    and t.task_name like concat('%', #{obj.taskName}::text, '%')
                 </if>
                  <if test="obj.dateRangeSo != null and obj.dateRangeSo.start != null">
                      and t.start_date <![CDATA[>=]]> #{obj.dateRangeSo.start}
@@ -60,7 +60,7 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
                     #{id}
                 </foreach>
                 <if test="obj.taskName != null and obj.taskName != ''">
-                    and t.task_name like concat('%', #{obj.taskName}, '%')
+                    and t.task_name like concat('%', #{obj.taskName}::text, '%')
                 </if>
                  <if test="obj.dateRangeSo != null and obj.dateRangeSo.start != null">
                      and t.start_date <![CDATA[>=]]> #{obj.dateRangeSo.start}
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java
index 9e56c90..66fd50c 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/InspectTaskDetailMapper.java
@@ -60,7 +60,7 @@ public interface InspectTaskDetailMapper extends BaseMapper<InspectTaskDetail> {
                    left join public.inspect_point t2 on t1.point_id = t2.id
                    left join public.inspect_item t3 on t1.item_id = t3.id
                    left join public.inspect_task t4 on t1.task_id =t4.id
-                   where t1.is_handle = 0
+                   where t1.is_handle = 0 and t4.status = 2
             </script>
              """)
     List<InspectProblemVo> handleList();