|
@@ -200,16 +200,16 @@
|
|
|
</if>
|
|
|
<if test=" bizArchiveInput != null and bizArchiveInput.map != null and bizArchiveInput.map.receiptDateFilter != null">
|
|
|
AND (
|
|
|
- DATE_FORMAT(collection.arrive_date,'%Y-%m-%d') >= #{bizArchiveInput.map.receiptDateFilter[0]}
|
|
|
+ DATE_FORMAT(collection.actually_date,'%Y-%m-%d') >= #{bizArchiveInput.map.receiptDateFilter[0]}
|
|
|
AND
|
|
|
- DATE_FORMAT(collection.arrive_date,'%Y-%m-%d') <= #{bizArchiveInput.map.receiptDateFilter[1]}
|
|
|
+ DATE_FORMAT(collection.actually_date,'%Y-%m-%d') <= #{bizArchiveInput.map.receiptDateFilter[1]}
|
|
|
)
|
|
|
</if>
|
|
|
<if test=" bizArchiveInput != null and bizArchiveInput.map != null and bizArchiveInput.map.actuallyDateFilter != null">
|
|
|
AND(
|
|
|
- DATE_FORMAT(collection.actually_date,'%Y-%m-%d') >= #{bizArchiveInput.map.actuallyDateFilter[0]}
|
|
|
+ DATE_FORMAT(collection.arrive_date,'%Y-%m-%d') >= #{bizArchiveInput.map.actuallyDateFilter[0]}
|
|
|
AND
|
|
|
- DATE_FORMAT(collection.actually_date,'%Y-%m-%d') <= #{bizArchiveInput.map.actuallyDateFilter[1]}
|
|
|
+ DATE_FORMAT(collection.arrive_date,'%Y-%m-%d') <= #{bizArchiveInput.map.actuallyDateFilter[1]}
|
|
|
)
|
|
|
</if>
|
|
|
<if test="taskTypeId != null ">
|