修复部分bug
This commit is contained in:
parent
7c209da2e2
commit
8f136095c5
|
|
@ -237,13 +237,8 @@
|
|||
where del_flag = '0'
|
||||
) ap on ap.project_id = wp.project_id and ap.rn = 1
|
||||
where wp.del_flag = '0'
|
||||
<if test="keyword != null and keyword != ''">
|
||||
and (wp.project_name like concat('%', #{keyword}, '%')
|
||||
or wp.project_code like concat('%', #{keyword}, '%')
|
||||
or wp.supervisor_name like concat('%', #{keyword}, '%'))
|
||||
</if>
|
||||
<if test="projectName != null and projectName != ''">
|
||||
and wp.project_name like concat('%', #{projectName}, '%')
|
||||
and (wp.project_name like concat('%', #{projectName}, '%') or wp.project_code like concat('%', #{projectName}, '%'))
|
||||
</if>
|
||||
<if test="projectCode != null and projectCode != ''">
|
||||
and wp.project_code like concat('%', #{projectCode}, '%')
|
||||
|
|
@ -263,12 +258,6 @@
|
|||
<if test="approvalStatus != null and approvalStatus != ''">
|
||||
and wp.approval_status = #{approvalStatus}
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
and date(wp.create_time) >= date(#{startTime})
|
||||
</if>
|
||||
<if test="endTime != null and endTime != ''">
|
||||
and date(wp.create_time) <= date(#{endTime})
|
||||
</if>
|
||||
order by wp.create_time desc
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue