From 3aab27eee1e176c26329875097653cc8558a8815 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Fri, 27 Sep 2024 15:03:15 +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=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=EF=BC=9B=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E6=A8=A1=E6=9D=BF=E4=B8=8B=E6=8B=89=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=8E=89=E6=9C=AA=E5=90=AF=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java    | 2 +-
 .../com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java   | 2 +-
 .../com/gunshi/project/xyt/service/AssessTemplateService.java   | 2 +-
 3 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 0138b53..2f5250c 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
@@ -121,7 +121,7 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
                 select t.* from public.assess_task t 
                 <where>
                 <if test="obj.taskName != null and obj.taskName != ''">
-                     t.task_name like concat('%', #{obj.taskName}, '%')
+                     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/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
index 45bda0b..c586277 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
@@ -59,7 +59,7 @@ public interface AssessTeamRatingMapper extends BaseMapper<AssessTeamRating> {
                     and t.object_id = #{obj.userId}
                 </if>
                 <if test="obj.taskName != null and obj.taskName != ''">
-                    and t5.task_name like concat('%', #{obj.taskName}, '%')
+                    and t5.task_name like concat('%', #{obj.taskName}::text, '%')
                 </if>
                  <if test="obj.dateRangeSo != null and obj.dateRangeSo.start != null">
                      and t.rectify_last_date <![CDATA[>=]]> #{obj.dateRangeSo.start}
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
index 750224e..a70f36a 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
@@ -118,7 +118,7 @@ public class AssessTemplateService extends ServiceImpl<AssessTemplateMapper, Ass
     }
 
     public List<AssessTemplate> listByType(Integer templateFreq) {
-        return this.list(new QueryWrapper<AssessTemplate>().eq("template_freq",templateFreq));
+        return this.list(new QueryWrapper<AssessTemplate>().eq("template_freq",templateFreq).eq("status",0));
     }
 }