解决考核任务查询报错;考核模板下拉过滤掉未启用的
parent
38cd12abcf
commit
3aab27eee1
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue