From d29f2d85ca43600992bbc451acef194e9a659611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 11:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/pay.pdm | 72 +++++++++---------- .../PayIncomeContractController.java | 5 +- .../entity/PayIncomeContractInstallment.java | 4 +- .../mapper/xml/PayIncomeContractMapper.xml | 4 ++ .../impl/PayIncomeContractServiceImpl.java | 7 +- .../com/jero/contract/vo/ProjectOutput.java | 11 ++- 6 files changed, 60 insertions(+), 43 deletions(-) diff --git a/db/pay.pdm b/db/pay.pdm index ce2ddc76..af6bcd2a 100644 --- a/db/pay.pdm +++ b/db/pay.pdm @@ -1,5 +1,5 @@ - + @@ -13556,8 +13556,8 @@ LABL 0 新宋体,8,N pay_spending_contract_installment 1629706931 lilili -1630635062 -lilili +1630982578 +LQT @@ -13600,10 +13600,10 @@ LABL 0 新宋体,8,N accounts_receivable_amount 1629770021 lilili -1630635062 -lilili -varchar(20) -20 +1630982578 +LQT +int(11) +11 44B204B5-3CC8-4955-A3FF-8BC9A68EC0E0 @@ -13611,9 +13611,9 @@ LABL 0 新宋体,8,N accounts_receivable_time 1629770021 lilili -1630635062 -lilili -datetime +1630982578 +LQT +date F7C67B9A-D07D-4E81-9BCE-1B7171F1178A @@ -13621,10 +13621,10 @@ LABL 0 新宋体,8,N paid_amount 1629770021 lilili -1630635062 -lilili -varchar(20) -20 +1630982578 +LQT +int(11) +11 80852A90-3EA9-4B46-8064-3DA5B659F384 @@ -13632,9 +13632,9 @@ LABL 0 新宋体,8,N paid_time 1629770021 lilili -1630635062 -lilili -datetime +1630982578 +LQT +date 56B3BE45-4096-4382-9F05-A130EAE15C3B @@ -13776,11 +13776,11 @@ LABL 0 新宋体,8,N 9ACA3F07-10E0-4456-BC65-29BEEF758DCC -签订单位联系人id2 -signed_contacts_id2 +签订单位联系人id +signed_contacts_id 1629768287 LQT -1630890240 +1630982525 LQT varchar(32) 32 @@ -14348,8 +14348,8 @@ LABL 0 新宋体,8,N pay_income_contract_installment 1629706929 lilili -1630635062 -lilili +1630982726 +LQT @@ -14392,10 +14392,10 @@ LABL 0 新宋体,8,N accounts_receivable_amount 1629770021 lilili -1630635062 -lilili -varchar(20) -20 +1630982726 +LQT +int(11) +11 33C4941B-9D64-4B40-AB13-8815FCC4D3DE @@ -14403,9 +14403,9 @@ LABL 0 新宋体,8,N accounts_receivable_time 1629770021 lilili -1630635062 -lilili -datetime +1630982726 +LQT +date 94BCB4AD-8947-45ED-B9D9-21A528B1C323 @@ -14413,10 +14413,10 @@ LABL 0 新宋体,8,N paid_amount 1629770021 lilili -1630635062 -lilili -varchar(20) -20 +1630982726 +LQT +int(11) +11 BEA9FB1A-3326-4271-904C-0BAC630F55C7 @@ -14424,9 +14424,9 @@ LABL 0 新宋体,8,N paid_time 1629770021 lilili -1630635062 -lilili -datetime +1630982726 +LQT +date 592EADCA-DD09-4735-96D4-F5230E54AF6F diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 22b59d0d..e1cbd7b3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -69,6 +69,7 @@ public class PayIncomeContractController extends JeroController{ int n = listSub.indexOf(p1) + 1; map.put("phaseName" + n,p1.getPhaseName()); - map.put("accountsReceivableAmount" + n,p1.getAccountsReceivableAmount()); + map.put("accountsReceivableAmount" + n,String.valueOf(p1.getAccountsReceivableAmount())); map.put("accountsReceivableTime" + n, DateUtils.date2Str(p1.getAccountsReceivableTime(),new SimpleDateFormat("yyyy-MM-dd"))); - map.put("paidAmount" + n,p1.getPaidAmount()); + map.put("paidAmount" + n,String.valueOf(p1.getPaidAmount())); map.put("paidTime" + n,DateUtils.date2Str(p1.getPaidTime(),new SimpleDateFormat("yyyy-MM-dd"))); }); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java index a17c009d..16215228 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java @@ -42,7 +42,7 @@ public class PayIncomeContractInstallment implements Serializable { /**应收金额*/ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") - private java.lang.String accountsReceivableAmount; + private java.lang.Integer accountsReceivableAmount; /**应收时间*/ @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @@ -52,7 +52,7 @@ public class PayIncomeContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") - private java.lang.String paidAmount; + private java.lang.Integer paidAmount; /**实收时间*/ @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 68247fa2..fb04ad27 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -78,6 +78,8 @@