Skip to content

platform / finance_serv

Go to a project
Commit b7567e95 by 王军业
Options

1215415485458

1 parent af809db1
Inline Side-by-side
Showing 2 changed files with 19 additions and 38 deletions
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -193,13 +193,11 @@ ...@@ -193,13 +193,11 @@
(select cast(e17_view.e17 as decimal(18,2)) from e17_view where e17_view.contract_unid=tb_contract.contract_unid) as advance_pay, (select cast(e17_view.e17 as decimal(18,2)) from e17_view where e17_view.contract_unid=tb_contract.contract_unid) as advance_pay,
(select cast(e18_view.e18 as decimal(18,2)) from e18_view where e18_view.contract_unid=tb_contract.contract_unid) as arrive_pay, (select cast(e18_view.e18 as decimal(18,2)) from e18_view where e18_view.contract_unid=tb_contract.contract_unid) as arrive_pay,
(select cast(e19_view.e19 as decimal(18,2)) from e19_view where e19_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay, (select cast(e19_view.e19 as decimal(18,2)) from e19_view where e19_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay,
(select cast(e20_view.e20 as decimal(18,2)) from e20_view where e20_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver, (select cast(e21_view.e21 as decimal(18,2)) from e21_view where e21_view.contract_unid=tb_contract.contract_unid) as mainten_pay,
(select cast(e21_view.e21 as decimal(18,2)) from e21_view where e21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc,
(select d18_view.d18 from d18_view where d18_view.contract_unid=tb_contract.contract_unid) as advance_pay_date, (select d18_view.d18 from d18_view where d18_view.contract_unid=tb_contract.contract_unid) as advance_pay_date,
(select d19_view.d19 from d19_view where d19_view.contract_unid=tb_contract.contract_unid) as arrive_pay_date, (select d19_view.d19 from d19_view where d19_view.contract_unid=tb_contract.contract_unid) as arrive_pay_date,
(select d20_view.d20 from d20_view where d20_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay_date, (select d20_view.d20 from d20_view where d20_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay_date,
(select d21_view.d21 from d21_view where d21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver_date, (select d22_view.d21 from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_date,
(select d22_view.d21 from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc_date,
(select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid ) as deliver_date, (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid ) as deliver_date,
(select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid ) as acceptanc_date (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid ) as acceptanc_date
from tb_contract where contract_unid = #{contract_unid} from tb_contract where contract_unid = #{contract_unid}
...@@ -412,13 +410,11 @@ ...@@ -412,13 +410,11 @@
(select cast(e17_view.e17 as decimal(18,2)) from e17_view where e17_view.contract_unid=tb_contract.contract_unid) as advance_pay, (select cast(e17_view.e17 as decimal(18,2)) from e17_view where e17_view.contract_unid=tb_contract.contract_unid) as advance_pay,
(select cast(e18_view.e18 as decimal(18,2)) from e18_view where e18_view.contract_unid=tb_contract.contract_unid) as arrive_pay, (select cast(e18_view.e18 as decimal(18,2)) from e18_view where e18_view.contract_unid=tb_contract.contract_unid) as arrive_pay,
(select cast(e19_view.e19 as decimal(18,2)) from e19_view where e19_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay, (select cast(e19_view.e19 as decimal(18,2)) from e19_view where e19_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay,
(select cast(e20_view.e20 as decimal(18,2)) from e20_view where e20_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver, (select cast(e21_view.e21 as decimal(18,2)) from e21_view where e21_view.contract_unid=tb_contract.contract_unid) as mainten_pay,
(select cast(e21_view.e21 as decimal(18,2)) from e21_view where e21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc,
(select d18_view.d18 from d18_view where d18_view.contract_unid=tb_contract.contract_unid) as advance_pay_date, (select d18_view.d18 from d18_view where d18_view.contract_unid=tb_contract.contract_unid) as advance_pay_date,
(select d19_view.d19 from d19_view where d19_view.contract_unid=tb_contract.contract_unid) as arrive_pay_date, (select d19_view.d19 from d19_view where d19_view.contract_unid=tb_contract.contract_unid) as arrive_pay_date,
(select d20_view.d20 from d20_view where d20_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay_date, (select d20_view.d20 from d20_view where d20_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay_date,
(select d21_view.d21 from d21_view where d21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver_date, (select d22_view.d21 from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_date,
(select d22_view.d21 from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc_date,
(select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid ) as deliver_date, (select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid ) as deliver_date,
(select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid ) as acceptanc_date (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid ) as acceptanc_date
from tb_contract where 1=1 from tb_contract where 1=1
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
...@@ -69,14 +69,12 @@ public class ContractVo extends SelectVo{ ...@@ -69,14 +69,12 @@ public class ContractVo extends SelectVo{
private Double advance_pay; //预付款金额 private Double advance_pay; //预付款金额
private Double arrive_pay; private Double arrive_pay;
private Double acceptanc_pay; private Double acceptanc_pay;
private Double mainten_pay_deliver; private Double mainten_pay;
private Double mainten_pay_acceptanc;
private Date advance_pay_date; //预付款到期日 private Date advance_pay_date; //预付款到期日
private Date arrive_pay_date; private Date arrive_pay_date;
private Date acceptanc_pay_date; private Date acceptanc_pay_date;
private Date mainten_pay_deliver_date; //质保款发货节点计算 private Date mainten_pay_date; //质保款
private Date mainten_pay_acceptanc_date; //质保款验收节点计算
private Date deliver_date; //发货日期 private Date deliver_date; //发货日期
private Date acceptanc_date; //验收日期 private Date acceptanc_date; //验收日期
...@@ -377,18 +375,6 @@ public class ContractVo extends SelectVo{ ...@@ -377,18 +375,6 @@ public class ContractVo extends SelectVo{
public void setAcceptanc_pay(Double acceptanc_pay) { public void setAcceptanc_pay(Double acceptanc_pay) {
this.acceptanc_pay = acceptanc_pay; this.acceptanc_pay = acceptanc_pay;
} }
public Double getMainten_pay_deliver() {
return mainten_pay_deliver;
}
public void setMainten_pay_deliver(Double mainten_pay_deliver) {
this.mainten_pay_deliver = mainten_pay_deliver;
}
public Double getMainten_pay_acceptanc() {
return mainten_pay_acceptanc;
}
public void setMainten_pay_acceptanc(Double mainten_pay_acceptanc) {
this.mainten_pay_acceptanc = mainten_pay_acceptanc;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class) @JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getAdvance_pay_date() { public Date getAdvance_pay_date() {
return advance_pay_date; return advance_pay_date;
...@@ -411,20 +397,6 @@ public class ContractVo extends SelectVo{ ...@@ -411,20 +397,6 @@ public class ContractVo extends SelectVo{
this.acceptanc_pay_date = acceptanc_pay_date; this.acceptanc_pay_date = acceptanc_pay_date;
} }
@JsonSerialize(using = DateYMDHMSJsonSerializer.class) @JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getMainten_pay_deliver_date() {
return mainten_pay_deliver_date;
}
public void setMainten_pay_deliver_date(Date mainten_pay_deliver_date) {
this.mainten_pay_deliver_date = mainten_pay_deliver_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getMainten_pay_acceptanc_date() {
return mainten_pay_acceptanc_date;
}
public void setMainten_pay_acceptanc_date(Date mainten_pay_acceptanc_date) {
this.mainten_pay_acceptanc_date = mainten_pay_acceptanc_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getDeliver_date() { public Date getDeliver_date() {
return deliver_date; return deliver_date;
} }
...@@ -498,6 +470,19 @@ public class ContractVo extends SelectVo{ ...@@ -498,6 +470,19 @@ public class ContractVo extends SelectVo{
public void setAmount_state_unid_name(String amount_state_unid_name) { public void setAmount_state_unid_name(String amount_state_unid_name) {
this.amount_state_unid_name = amount_state_unid_name; this.amount_state_unid_name = amount_state_unid_name;
} }
public Double getMainten_pay() {
return mainten_pay;
}
public void setMainten_pay(Double mainten_pay) {
this.mainten_pay = mainten_pay;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getMainten_pay_date() {
return mainten_pay_date;
}
public void setMainten_pay_date(Date mainten_pay_date) {
this.mainten_pay_date = mainten_pay_date;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!