|
|
@@ -716,12 +716,14 @@
|
|
|
c.debit_id debitId, debit.real_amount DebitRealAmount ,debit.settlement_amount DebitSettlementAmount,debit.liquidation_status DebitliquidationStatus,
|
|
|
d.id detId,d.`type` detType,d.amount detAmount,d.real_amount detRealAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
|
|
|
d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,d.type_other detTypeOther,
|
|
|
- date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
|
|
|
+ tm.buyer_name,o.buyer_id,
|
|
|
+ date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
|
|
|
date_format(d.agree_time,'%Y-%m-%d')agreeTime
|
|
|
from expense_relationship a left join expense_account b on a.id =b.id left join expense_account c on a.ea_id =c.id
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
left join expense_account_private eap on b.eaaid =eap.id left join expense_account_details d on c.id =d.eaid
|
|
|
- left join t_order_new o on c.order_no =o.order_no left join public_release pr on c.prid=pr.id left join t_order_new pro on pr.order_no=pro.order_no
|
|
|
+ left join t_order_new o on c.order_no =o.order_no left join t_order_mid tm on c.order_no=tm.order_no
|
|
|
+ left join public_release pr on c.prid=pr.id left join t_order_new pro on pr.order_no=pro.order_no
|
|
|
left join expense_account debit on c.debit_id=debit.id
|
|
|
where a.id= #{id}
|
|
|
</select>
|
|
|
@@ -784,6 +786,8 @@
|
|
|
<result column="debitLiquidationStatus" jdbcType="INTEGER" property="debitLiquidationStatus" />
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
<result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
|
|
|
+ <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
|
|
|
+ <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
|
|
|
<result column="publicReleaseType" jdbcType="INTEGER" property="publicReleaseType" />
|
|
|
<association property="detList" resultMap="ExpenseAccountDetailsMap"/>
|
|
|
</resultMap>
|
|
|
@@ -990,10 +994,10 @@
|
|
|
select count(*)
|
|
|
from expense_account_details ead left join expense_account a on ead.eaid =a.id
|
|
|
left join expense_relationship er on a.id=er.ea_id left join expense_account mea on er.id=mea.id
|
|
|
- left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
|
|
|
+ left join t_order_new o on a.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
|
|
|
left join department dep on mea.apply_dep =dep.id
|
|
|
- left join department dep2 on mea.pay_dep =dep2.id left join admin ad on mea.aid=ad.id
|
|
|
- left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
|
|
|
+ left join department dep2 on mea.pay_dep =dep2.id left join admin ad on a.aid=ad.id
|
|
|
+ left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id
|
|
|
where 1=1
|
|
|
<include refid="ExpenseDetailsSql"/>
|
|
|
</select>
|
|
|
@@ -1001,10 +1005,10 @@
|
|
|
select sum(ead.amount) totalAmount
|
|
|
from expense_account_details ead left join expense_account a on ead.eaid =a.id
|
|
|
left join expense_relationship er on a.id=er.ea_id left join expense_account mea on er.id=mea.id
|
|
|
- left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
|
|
|
+ left join t_order_new o on a.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
|
|
|
left join department dep on mea.apply_dep =dep.id
|
|
|
- left join department dep2 on mea.pay_dep =dep2.id left join admin ad on mea.aid=ad.id
|
|
|
- left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
|
|
|
+ left join department dep2 on mea.pay_dep =dep2.id left join admin ad on a.aid=ad.id
|
|
|
+ left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id
|
|
|
where 1=1
|
|
|
<include refid="ExpenseDetailsSql"/>
|
|
|
</select>
|