|
|
|
@@ -135,10 +135,10 @@ |
|
|
|
AND type = #{type,jdbcType=TINYINT} |
|
|
|
</if> |
|
|
|
<if test="startDate != null"> |
|
|
|
AND `create_date` > #{startDate,jdbcType=TIMESTAMP} |
|
|
|
AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) |
|
|
|
</if> |
|
|
|
<if test="endDate != null"> |
|
|
|
AND `create_date` < #{endDate,jdbcType=TIMESTAMP} |
|
|
|
AND unix_timestamp(`create_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) |
|
|
|
</if> |
|
|
|
</select> |
|
|
|
|
|
|
|
@@ -146,15 +146,15 @@ |
|
|
|
select |
|
|
|
<include refid="allColumns"/> |
|
|
|
from wx_order |
|
|
|
where order_status = 7 and press_end_date is not null |
|
|
|
where press_end_date is not null and (order_status = 6 or order_status = 7) |
|
|
|
<if test="type != null"> |
|
|
|
AND type = #{type,jdbcType=TINYINT} |
|
|
|
</if> |
|
|
|
<if test="startDate != null"> |
|
|
|
AND `create_date` > #{startDate,jdbcType=TIMESTAMP} |
|
|
|
AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) |
|
|
|
</if> |
|
|
|
<if test="endDate != null"> |
|
|
|
AND `press_end_date` < #{endDate,jdbcType=TIMESTAMP} |
|
|
|
AND unix_timestamp(`press_end_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) |
|
|
|
</if> |
|
|
|
</select> |
|
|
|
|
|
|
|
|