|
@@ -106,11 +106,11 @@
|
|
|
AND a.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
UNION ALL
|
|
@@ -186,11 +186,11 @@
|
|
|
AND s.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
group by w.id
|
|
@@ -275,11 +275,11 @@
|
|
|
AND w.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
group by w.id
|
|
@@ -351,11 +351,11 @@
|
|
|
AND w.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
group by w.id
|
|
@@ -437,11 +437,11 @@
|
|
|
AND w.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
GROUP BY w.id
|
|
@@ -522,11 +522,11 @@
|
|
|
AND s.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- AND (DATE_FORMAT(s.delivery_date,"%Y%m%d%H%i%s") >=
|
|
|
+ AND (DATE_FORMAT(s.delivery_date,"%Y%m%d%H%i%s") >
|
|
|
DATE_FORMAT(#{startDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
<if test="endDate != null">
|
|
|
- AND (DATE_FORMAT(s.delivery_date,"%Y%m%d%H%i%s") <=
|
|
|
+ AND (DATE_FORMAT(s.delivery_date,"%Y%m%d%H%i%s") <
|
|
|
DATE_FORMAT(#{endDate},"%Y%m%d%H%i%s"))
|
|
|
</if>
|
|
|
GROUP BY w.id
|