|
|
@@ -264,10 +264,11 @@
|
|
|
</update>
|
|
|
|
|
|
<sql id="selectDtailsSql">
|
|
|
- a.id, a.prid, a.order_no orderNo, a.aid, a.aname, a.`type`, a.type_other typeOther , a.status, a.process_status processStatus,
|
|
|
- a.total_amount totalAmount, a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,
|
|
|
- a.district_name districtName, a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,
|
|
|
- b.name appDepName,c.name payDepName,d.name ,d.bank ,d.accounts ,
|
|
|
+ a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
|
|
|
+ a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,
|
|
|
+ a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
|
|
|
+ a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
|
|
|
+ c.name payDepName,d.name ,d.bank ,d.accounts ,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
|
|
|
date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
|
|
|
date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
|
|
|
@@ -276,7 +277,8 @@
|
|
|
SELECT
|
|
|
<include refid="selectDtailsSql"/>
|
|
|
FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
- left join expense_account_private d on a.eaaid=d.id
|
|
|
+ left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
|
|
|
+ left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
WHERE a.id= #{id}
|
|
|
</select>
|
|
|
|
|
|
@@ -339,4 +341,13 @@
|
|
|
WHERE a.status= #{status}
|
|
|
and a.prid= #{prid} and a.aid = #{aid}
|
|
|
</select>
|
|
|
+ <select id="selectByaidAndType" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
|
|
|
+ SELECT
|
|
|
+ <include refid="selectDtailsSql"/>
|
|
|
+ FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
+ left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
|
|
|
+ left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
+ WHERE a.status=2
|
|
|
+ and a.aid= #{aid} and a.type= #{type}
|
|
|
+ </select>
|
|
|
</mapper>
|