|
@@ -457,7 +457,7 @@
|
|
|
|
|
|
|
|
</if>
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
<if test="expenseMain ==1">
|
|
|
- a.examine_name examineName,a.check_no checkNo,a.target_type targetType,a.order_remarks orderRemarks,
|
|
|
|
|
|
|
+ a.examine_name examineName,a.check_no checkNo,a.target_type targetType,
|
|
|
</if>
|
|
</if>
|
|
|
f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
|
|
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
|
|
b.name applyDepName, c.name payDepName
|
|
@@ -852,15 +852,6 @@
|
|
|
set c.status =b.status ,c.process_status =b.process_status
|
|
set c.status =b.status ,c.process_status =b.process_status
|
|
|
where a.id= #{id}
|
|
where a.id= #{id}
|
|
|
</update>
|
|
</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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|