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 { and status in (1,9) ) - and t.task_name like concat('%', #{obj.taskName}, '%') + and t.task_name like concat('%', #{obj.taskName}::text, '%') and t.start_date =]]> #{obj.dateRangeSo.start} @@ -60,7 +60,7 @@ public interface AssessTaskMapper extends BaseMapper { #{id} - and t.task_name like concat('%', #{obj.taskName}, '%') + and 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/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 { 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 """) List handleList();