From bd63856f3d6ba9928830beece684b05ac0afaeaf Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Aug 2022 14:09:52 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E7=BC=96=E8=BE=91sql=20=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 12 ++-- .../impl/PayConfirmPaymentRecordService.java | 65 +++++++++++++++---- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 02d26bae..ed78ab82 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -248,7 +248,7 @@ alter table pay_confirm_payment_record add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; -- 项目增加确认收入状态，税额，未税金额 alter table pay_common_project - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', @@ -256,7 +256,7 @@ alter table pay_common_project add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_working_group_subitem - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', @@ -264,7 +264,7 @@ alter table pay_working_group_subitem add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_member_project_subitem - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', @@ -272,7 +272,7 @@ alter table pay_member_project_subitem add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table pay_meeting_situation - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', @@ -280,7 +280,7 @@ alter table pay_meeting_situation add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table tb_member_project_subitem - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', @@ -288,7 +288,7 @@ alter table tb_member_project_subitem add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; alter table tb_certificate_payment - add column affirm_income tinyint(1) null comment '确认收入', + add column affirm_income tinyint(1) default 0 comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', add column confirm_tax decimal(12, 2) default 0 comment '确认金额税额', add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java index 0ae7e4a5..c8385c45 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java @@ -87,7 +87,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getReceivableAmount(), confirmAmount); PayCommonProject project = new PayCommonProject(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -211,7 +211,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getReceivableAmount(), confirmAmount); PayWorkingGroupSubItem project = new PayWorkingGroupSubItem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -224,7 +224,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getAmountReceivable(), confirmAmount); PayMeetingSituation project = new PayMeetingSituation(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -237,7 +237,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getAmountReceivable(), confirmAmount); PayMemberProjectSubitem project = new PayMemberProjectSubitem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -250,7 +250,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getAmountReceivable(), confirmAmount); TbMemberProjectSubitem project = new TbMemberProjectSubitem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -263,7 +263,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); - Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + Integer affirmIncome = getAffirmIncome(p.getAmountReceivable(), confirmAmount); TbCertificatePayment project = new TbCertificatePayment(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); @@ -274,6 +274,47 @@ public class PayConfirmPaymentRecordService extends ServiceImpl实收>0 + if(receivableAmount.compareTo(paidAmount) > 0 && paidAmount.compareTo(zero) > 0){ + return 2; + } + //应收=实收 + if(receivableAmount.compareTo(paidAmount) == 0){ + return 1; + } + //实收 > 应收 + if(paidAmount.compareTo(receivableAmount) > 0){ + return 1; + } + //实收=0 + if(paidAmount.compareTo(zero)==0){ + return 0; + }else{ + //无意义 + return 2; + } + + } + }