|
@@ -205,11 +205,11 @@
|
|
DB.RESULT_FOREIGN_SHIP_NAME || rm.MATERIAL_NAME like concat('%',concat(#{input},'%'))
|
|
DB.RESULT_FOREIGN_SHIP_NAME || rm.MATERIAL_NAME like concat('%',concat(#{input},'%'))
|
|
</if>
|
|
</if>
|
|
<if test="oneDate != null">
|
|
<if test="oneDate != null">
|
|
- and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= WOR.INSERT_TIME
|
|
|
|
|
|
+ and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= WOR.WORK_TIME
|
|
</if>
|
|
</if>
|
|
<if test="startDate != null">
|
|
<if test="startDate != null">
|
|
- and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WOR.INSERT_TIME
|
|
|
|
- and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WOR.INSERT_TIME
|
|
|
|
|
|
+ and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WOR.WORK_TIME
|
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WOR.WORK_TIME
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
GROUP BY rm.MATERIAL_NAME,DB.RESULT_FOREIGN_SHIP_NAME
|
|
GROUP BY rm.MATERIAL_NAME,DB.RESULT_FOREIGN_SHIP_NAME
|