|
|
@@ -456,7 +456,7 @@
|
|
|
mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, mea.target_type targetType,
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
- a.examine_name examineName,a.check_no checkNo,a.target_type targetType,
|
|
|
+ a.examine_name examineName,a.check_no checkNo,a.target_type targetType,a.order_remarks orderRemarks,
|
|
|
</if>
|
|
|
f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
|
|
|
b.name applyDepName, c.name payDepName
|
|
|
@@ -851,9 +851,18 @@
|
|
|
set c.status =b.status ,c.process_status =b.process_status
|
|
|
where a.id= #{id}
|
|
|
</update>
|
|
|
+ <update id="updateByOrderRemarks">
|
|
|
+ update expense_account x ,(select a.id,GROUP_CONCAT('【',e.buyer_name ,',',d.contract_no,'】') orderRemarks
|
|
|
+ from expense_account a left join expense_relationship b on a.id=b.id
|
|
|
+ left join expense_account c on b.ea_id =c.id left join t_order_new d on c.order_no =d.order_no
|
|
|
+ left join t_order_mid e on c.order_no =e.order_no and a.id= #{id}
|
|
|
+ group by a.id)y
|
|
|
+ set x.order_remarks=y.orderRemarks
|
|
|
+ where x.id=y.id
|
|
|
+ </update>
|
|
|
|
|
|
|
|
|
- <select id="ExpenseMainList" resultMap="MainMap">
|
|
|
+ <select id="ExpenseMainList" resultMap="MainMap">
|
|
|
select b.id,b.check_no,b.total_amount,b.real_amount ,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
|
|
|
date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
|
|
|
dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid
|