|
|
@@ -847,7 +847,7 @@
|
|
|
<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
|
|
|
<bind name="a" value="o.startTime + ' 00:00:00'"/>
|
|
|
<bind name="b" value="o.endTime + ' 23:59:59'"/>
|
|
|
- and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
union
|
|
|
select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
|
|
|
@@ -870,7 +870,7 @@
|
|
|
<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
|
|
|
<bind name="a" value="o.startTime + ' 00:00:00'"/>
|
|
|
<bind name="b" value="o.endTime + ' 23:59:59'"/>
|
|
|
- and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
)oo
|
|
|
<if test="ob == 1">
|
|
|
@@ -909,7 +909,7 @@
|
|
|
<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
|
|
|
<bind name="a" value="o.startTime + ' 00:00:00'"/>
|
|
|
<bind name="b" value="o.endTime + ' 23:59:59'"/>
|
|
|
- and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
union
|
|
|
select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
|
|
|
@@ -1012,7 +1012,7 @@
|
|
|
select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
|
|
|
a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,
|
|
|
ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,
|
|
|
- o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,
|
|
|
+ o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,a.create_time as createTime,
|
|
|
0 as companyId, "湖南科德信息咨询有限公司" as companyName
|
|
|
from t_order_new o
|
|
|
left join `user` u on o.buyer_id = u.id
|
|
|
@@ -1045,7 +1045,7 @@
|
|
|
<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
|
|
|
<bind name="a" value="o.startTime + ' 00:00:00'"/>
|
|
|
<bind name="b" value="o.endTime + ' 23:59:59'"/>
|
|
|
- and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
order by o.liquidation_status, o.sign_time desc
|
|
|
<if test="page_sql != null">
|
|
|
@@ -1085,7 +1085,7 @@
|
|
|
<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
|
|
|
<bind name="a" value="o.startTime + ' 00:00:00'"/>
|
|
|
<bind name="b" value="o.endTime + ' 23:59:59'"/>
|
|
|
- and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
+ and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
</select>
|
|
|
<!-- 通过订单编号获得订单的负责人(营销员) -->
|
|
|
@@ -1247,7 +1247,7 @@
|
|
|
and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="starTime !=null and endTime !=null">
|
|
|
- and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
+ and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
</select>
|
|
|
|