|
@@ -126,16 +126,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="priority != null "> and t.priority = #{priority}</if>
|
|
|
<if test="state != null "> and t.state = #{state}</if>
|
|
|
<if test="createUser != null and createUser != ''"> and t.create_user = #{createUser}</if>
|
|
|
-<!-- <if test="createDate != null "> and t.create_date = #{createDate}</if>-->
|
|
|
+ <!-- <if test="createDate != null "> and t.create_date = #{createDate}</if>-->
|
|
|
<if test="taskType != null and taskType != ''"> and t.task_type = #{taskType}</if>
|
|
|
<if test="shopId != null and shopId != ''"> and t.shop_id = #{shopId}</if>
|
|
|
-<!-- <if test="startTime != null "> and t.start_time = #{startTime}</if>-->
|
|
|
-<!-- <if test="endTime != null "> and t.end_time = #{endTime}</if>-->
|
|
|
- <if test="createDate != null and createDate != ''"><!-- 开始时间检索 -->
|
|
|
- AND date_format(t.create_time,'%y%m%d') >= date_format(#{createDate},'%y%m%d')
|
|
|
+ <!-- <if test="startTime != null "> and t.start_time = #{startTime}</if>-->
|
|
|
+ <!-- <if test="endTime != null "> and t.end_time = #{endTime}</if>-->
|
|
|
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
|
|
+ AND date_format(t.create_date,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
|
|
- AND date_format(t.create_time,'%y%m%d') <= date_format(#{createDate},'%y%m%d')
|
|
|
+ AND date_format(t.create_date,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="parentTask != null and parentTask != ''"> and t.parent_task = #{parentTask}</if>
|
|
|
<if test="agvNo != null and agvNo != ''"> and t.agv_no like concat('%', #{agvNo}, '%')</if>
|