|
@@ -70,8 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="userId != null ">AND t1.user_id = #{userId}</if>
|
|
<if test="userId != null ">AND t1.user_id = #{userId}</if>
|
|
<if test="deptId != null ">AND t1.dept_id = #{deptId}</if>
|
|
<if test="deptId != null ">AND t1.dept_id = #{deptId}</if>
|
|
<if test="creatorId != null ">AND t1.creator_id = #{creatorId}</if>
|
|
<if test="creatorId != null ">AND t1.creator_id = #{creatorId}</if>
|
|
- <if test="startTimeString != null and startTimeString!=''">AND t1.start_time >= #{startTimeString}</if>
|
|
|
|
- <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time <= #{endTimeString}</if>
|
|
|
|
|
|
+ <if test="startTimeString != null and startTimeString!=''">AND t1.create_time >= #{startTimeString}</if>
|
|
|
|
+ <if test="endTimeString != null and endTimeString!='' ">AND t1.create_time <= #{endTimeString}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="status != null ">AND t1.status = #{status}</if>
|
|
<if test="status != null ">AND t1.status = #{status}</if>
|
|
<if test="inspectionChamberId != null ">AND t1.inspection_chamber_id = #{inspectionChamberId}</if>
|
|
<if test="inspectionChamberId != null ">AND t1.inspection_chamber_id = #{inspectionChamberId}</if>
|
|
@@ -100,8 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
t1.deleted = 0 and t1.status != 0
|
|
t1.deleted = 0 and t1.status != 0
|
|
AND t1.return_receipt_detail_id =0
|
|
AND t1.return_receipt_detail_id =0
|
|
<if test="deptId != null ">AND t1.dept_id = #{deptId}</if>
|
|
<if test="deptId != null ">AND t1.dept_id = #{deptId}</if>
|
|
- <if test="startTimeString != null and startTimeString!=''">AND t1.start_time >= #{startTimeString}</if>
|
|
|
|
- <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time <= #{endTimeString}</if>
|
|
|
|
|
|
+ <if test="startTimeString != null and startTimeString!=''">AND t1.create_time >= #{startTimeString}</if>
|
|
|
|
+ <if test="endTimeString != null and endTimeString!='' ">AND t1.create_time <= #{endTimeString}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="keyword != null and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
|
|
<if test="keyword != null and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
|
|
LIKE CONCAT('%',#{keyword},'%') OR
|
|
LIKE CONCAT('%',#{keyword},'%') OR
|
|
@@ -120,8 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="lotCode != null and lotCode != ''">AND t1.lot_code = #{lotCode}</if>
|
|
<if test="lotCode != null and lotCode != ''">AND t1.lot_code = #{lotCode}</if>
|
|
<if test="userId != null ">AND t1.user_id = #{userId}</if>
|
|
<if test="userId != null ">AND t1.user_id = #{userId}</if>
|
|
<if test="isAuto != null ">AND t1.is_auto = #{isAuto}</if>
|
|
<if test="isAuto != null ">AND t1.is_auto = #{isAuto}</if>
|
|
- <if test="startTimeString != null and startTimeString!=''">AND t1.start_time >= #{startTimeString}</if>
|
|
|
|
- <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time <= #{endTimeString}</if>
|
|
|
|
|
|
+ <if test="startTimeString != null and startTimeString!=''">AND t1.create_time >= #{startTimeString}</if>
|
|
|
|
+ <if test="endTimeString != null and endTimeString!='' ">AND t1.create_time <= #{endTimeString}</if>
|
|
<if test="status != null ">AND t1.status = #{status}</if>
|
|
<if test="status != null ">AND t1.status = #{status}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="type != null ">AND t1.type = #{type}</if>
|
|
<if test="keyword != null and keyword != '' ">
|
|
<if test="keyword != null and keyword != '' ">
|