Skip to content

platform / finance_serv

Go to a project
Commit 61a086da by 王军业
Options

[新加导出字段]

1 parent 09d26c09
Inline Side-by-side
Showing 2 changed files with 128 additions and 1 deletions
code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java
...@@ -95,8 +95,126 @@ public class ExportModel { ...@@ -95,8 +95,126 @@ public class ExportModel {
@Excel(name="累计开票金额",width=15,type=1,numFormat="###############.00") @Excel(name="累计开票金额",width=15,type=1,numFormat="###############.00")
private Double total_receipt_amount; private Double total_receipt_amount;
@Excel(name="合同备注",width=35)
private String contract_note;
@Excel(name="坏账金额备注",width=35)
private String bad_amount_note;
@Excel(name="暂停金额备注",width=35)
private String reback_note;
@Excel(name="豁免金额备注",width=35)
private String contract_remain_note;
@Excel(name="抵扣金额备注",width=35)
private String contract_amount_note;
@Excel(name="预付款比例")
private Double advance_pay_proporition;
@Excel(name="到货款比例")
private Double arrive_pay_proportion;
@Excel(name="验收款比例")
private Double acceptanc_pay_proportion;
@Excel(name="质保款比例")
private Double mainten_pay_proportition;
@Excel(name="预付款条件",width=35)
private String advance_pay_requirement;
@Excel(name="到货款条件",width=35)
private String arrive_pay_requirement;
@Excel(name="验收款条件",width=35)
private String acceptanc_pay_requirement;
@Excel(name="质保款条件",width=35)
private String mainten_pay_requirement;
public String getContract_note() {
return contract_note;
}
public void setContract_note(String contract_note) {
this.contract_note = contract_note;
}
public String getBad_amount_note() {
return bad_amount_note;
}
public void setBad_amount_note(String bad_amount_note) {
this.bad_amount_note = bad_amount_note;
}
public String getReback_note() {
return reback_note;
}
public void setReback_note(String reback_note) {
this.reback_note = reback_note;
}
public String getContract_remain_note() {
return contract_remain_note;
}
public void setContract_remain_note(String contract_remain_note) {
this.contract_remain_note = contract_remain_note;
}
public String getContract_amount_note() {
return contract_amount_note;
}
public void setContract_amount_note(String contract_amount_note) {
this.contract_amount_note = contract_amount_note;
}
public Double getAdvance_pay_proporition() {
return advance_pay_proporition;
}
public void setAdvance_pay_proporition(Double advance_pay_proporition) {
this.advance_pay_proporition = advance_pay_proporition;
}
public Double getArrive_pay_proportion() {
return arrive_pay_proportion;
}
public void setArrive_pay_proportion(Double arrive_pay_proportion) {
this.arrive_pay_proportion = arrive_pay_proportion;
}
public Double getAcceptanc_pay_proportion() {
return acceptanc_pay_proportion;
}
public void setAcceptanc_pay_proportion(Double acceptanc_pay_proportion) {
this.acceptanc_pay_proportion = acceptanc_pay_proportion;
}
public Double getMainten_pay_proportition() {
return mainten_pay_proportition;
}
public void setMainten_pay_proportition(Double mainten_pay_proportition) {
this.mainten_pay_proportition = mainten_pay_proportition;
}
public String getAdvance_pay_requirement() {
return advance_pay_requirement;
}
public void setAdvance_pay_requirement(String advance_pay_requirement) {
this.advance_pay_requirement = advance_pay_requirement;
}
public String getArrive_pay_requirement() {
return arrive_pay_requirement;
}
public void setArrive_pay_requirement(String arrive_pay_requirement) {
this.arrive_pay_requirement = arrive_pay_requirement;
}
public String getAcceptanc_pay_requirement() {
return acceptanc_pay_requirement;
}
public void setAcceptanc_pay_requirement(String acceptanc_pay_requirement) {
this.acceptanc_pay_requirement = acceptanc_pay_requirement;
}
public String getMainten_pay_requirement() {
return mainten_pay_requirement;
}
public void setMainten_pay_requirement(String mainten_pay_requirement) {
this.mainten_pay_requirement = mainten_pay_requirement;
}
public Double getConfirm_income_amount() { public Double getConfirm_income_amount() {
return confirm_income_amount; return confirm_income_amount;
} }
......
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -621,8 +621,17 @@ ...@@ -621,8 +621,17 @@
is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, (cast(confirm_income_amount as decimal(18,2))) as confirm_income_amount, is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, (cast(confirm_income_amount as decimal(18,2))) as confirm_income_amount,
amount_state_unid, to_char(start_guarantee_date, 'yyyy-MM-dd') as start_guarantee_date, to_char(end_guarantee_date, 'yyyy-MM-dd') as end_guarantee_date, amount_state_unid, to_char(start_guarantee_date, 'yyyy-MM-dd') as start_guarantee_date, to_char(end_guarantee_date, 'yyyy-MM-dd') as end_guarantee_date,
mainten_start_point, contract_note, is_delete, project_unid, mainten_start_point, contract_note, is_delete, project_unid,
customer_unid, customer_unid,contract_note,
<!-- cast(confirm_income_amount as decimal(18,2)) as confirm_income_amount, --> <!-- cast(confirm_income_amount as decimal(18,2)) as confirm_income_amount, -->
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100001') as advance_pay_proporition,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100002') as arrive_pay_proportion,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100003') as acceptanc_pay_proportion,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND (tb_payment_agree.payment_type = '100004' OR tb_payment_agree.payment_type = '100005')) as mainten_pay_proportition,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100001') as advance_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100002') as arrive_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100003') as acceptanc_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND (tb_payment_agree.payment_type = '100004' OR tb_payment_agree.payment_type = '100005')) as mainten_pay_requirement,
(select cast(sum(receipt_amount) as decimal(18,2)) from tb_receipt where tb_receipt.contract_unid = tb_contract.contract_unid) as total_receipt_amount , (select cast(sum(receipt_amount) as decimal(18,2)) from tb_receipt where tb_receipt.contract_unid = tb_contract.contract_unid) as total_receipt_amount ,
to_char(sign_date,'yyyy') as year, to_char(sign_date,'MM') as month, to_char(sign_date,'yyyy') as year, to_char(sign_date,'MM') as month,
(cast(contract_amount as decimal(18,2))-(select cast(total_reback_view."sum" as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(CASE WHEN deduct_amount IS NULL THEN 0 ELSE deduct_amount end as decimal(18,2))-cast(CASE WHEN stop_amount IS NULL THEN 0 ELSE stop_amount END as decimal(18,2)) (cast(contract_amount as decimal(18,2))-(select cast(total_reback_view."sum" as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(CASE WHEN deduct_amount IS NULL THEN 0 ELSE deduct_amount end as decimal(18,2))-cast(CASE WHEN stop_amount IS NULL THEN 0 ELSE stop_amount END as decimal(18,2))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!