|
|
@@ -690,11 +690,12 @@ select
|
|
|
where status != 4 and order_no= #{orderNo}
|
|
|
</select>
|
|
|
<select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
|
|
|
- select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType,
|
|
|
+ select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType,
|
|
|
date_format(b.create_time,'%Y-%m-%d %H:%i:%S')establishTimes, b.order_status orderStatus,b.total_amount totalAmount,a.status ,
|
|
|
b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,a.`type`,
|
|
|
- a.process_state processState from new_order_change a left join t_order_new b on a.order_no=b.order_no
|
|
|
- left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
|
|
|
+ a.process_state processState from (select max(id)id from new_order_change group by order_no) noc left join new_order_change a on noc.id=a.id
|
|
|
+ left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id
|
|
|
+ left join department e on b.order_dep=e.id
|
|
|
<if test="processState==2 or processState==3 ">
|
|
|
left join (select order_no,consultant_id,manager_id from t_order_task group by order_no,consultant_id,manager_id) x on a.order_no=x.order_no
|
|
|
</if>
|
|
|
@@ -784,7 +785,8 @@ select
|
|
|
</select>
|
|
|
|
|
|
<select id="selectOrderChangeCount" resultType="java.lang.Integer">
|
|
|
- select count(*) from new_order_change a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id
|
|
|
+ select count(*) from (select max(id)id from new_order_change group by order_no) noc left join new_order_change a on noc.id=a.id
|
|
|
+ left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id
|
|
|
left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
|
|
|
<if test="processState==2 or processState==3 ">
|
|
|
left join t_order_task x on a.order_no=x.order_no
|
|
|
@@ -879,4 +881,7 @@ select
|
|
|
set `refund_Invoice`=ifnull(`refund_Invoice`,0)- #{amount}
|
|
|
where order_no= #{orderNo}
|
|
|
</update>
|
|
|
+ <select id="getOrderChange" resultType="java.util.Map">
|
|
|
+ select id,used_order usedOrder from new_order_change where order_no= #{orderNo} order by id
|
|
|
+ </select>
|
|
|
</mapper>
|