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 { select t.* from public.assess_task t - t.task_name like concat('%', #{obj.taskName}, '%') + t.task_name like concat('%', #{obj.taskName}::text, '%') and t.start_date =]]> #{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 { and t.object_id = #{obj.userId} - and t5.task_name like concat('%', #{obj.taskName}, '%') + and t5.task_name like concat('%', #{obj.taskName}::text, '%') and t.rectify_last_date =]]> #{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 listByType(Integer templateFreq) { - return this.list(new QueryWrapper().eq("template_freq",templateFreq)); + return this.list(new QueryWrapper().eq("template_freq",templateFreq).eq("status",0)); } }