From c370ad993585d457c43c83aa974b3765c77d7869 Mon Sep 17 00:00:00 2001 From: zhangqinlin <> Date: Tue, 12 Jul 2022 14:56:09 +0800 Subject: [PATCH 01/28] =?UTF-8?q?add=EF=BC=9A=E7=BB=9F=E8=AE=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=9C=88=E4=BB=BD=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/PayWorkingGroupSearch.java | 3 ++ .../entity/PayWorkingGroupSubletSearch.java | 3 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 39 +++++++++++++++++++ .../xml/PayWorkingGroupSubItemMapper.xml | 6 +++ .../entity/AllProjectStatisticsSearch.java | 3 ++ .../entity/CompanyComeMoneyDetailSearch.java | 3 ++ .../entity/CompanyComeMoneySearch.java | 3 ++ .../entity/DepartStatisticsSearch.java | 3 ++ .../entity/PrincipalPeopleDetailSearch.java | 3 ++ .../entity/PrincipalPeopleSearch.java | 3 ++ 10 files changed, 69 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java index f2d898e0..8cc5addb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java @@ -28,6 +28,9 @@ public class PayWorkingGroupSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "应收总金额范围") private String allMoneyTwo; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java index 69711955..40fc47c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java @@ -38,6 +38,9 @@ public class PayWorkingGroupSubletSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "来款用途") private String chargeUse; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 022cc002..a38295e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -164,6 +164,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSearch.paymentMonth}, '%') + @@ -245,6 +248,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSearch.paymentMonth}, '%') + @@ -427,6 +433,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{allProjectStatisticsSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{allProjectStatisticsSearch.paymentMonth}, '%') + and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%') @@ -1112,6 +1121,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleSearch.paymentMonth}, '%') + group by principalId ) ppp @@ -1195,6 +1207,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleSearch.paymentMonth}, '%') + group by principalId ) ppp @@ -1382,6 +1397,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleDetailSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleDetailSearch.paymentMonth}, '%') + @@ -1439,6 +1457,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleDetailSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleDetailSearch.paymentMonth}, '%') + ) pp @@ -1747,6 +1768,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{companyComeMoneySearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{companyComeMoneySearch.paymentMonth}, '%') + group by chargeCompanyId @@ -1829,6 +1853,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{companyComeMoneySearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{companyComeMoneySearch.paymentMonth}, '%') + group by chargeCompanyId @@ -2014,6 +2041,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{CompanyComeMoneyDetailSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{CompanyComeMoneyDetailSearch.paymentMonth}, '%') + ) p @@ -2105,6 +2135,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{CompanyComeMoneyDetailSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{CompanyComeMoneyDetailSearch.paymentMonth}, '%') + ) pp @@ -2139,6 +2172,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{departStatisticsSearch.paymentMonth}, '%') + group by v.departId) p @@ -2189,6 +2225,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{departStatisticsSearch.paymentMonth}, '%') + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 17d4a569..b5c822f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -121,6 +121,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%') + group by id @@ -184,6 +187,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%') + group by id) p diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java index 1bb0852c..1d1cb9db 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java @@ -50,6 +50,9 @@ public class AllProjectStatisticsSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java index 436561aa..6d6e83be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java @@ -44,6 +44,9 @@ public class CompanyComeMoneyDetailSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index 6e9c5797..1341be74 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -35,6 +35,9 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java index 30197c09..9d2f71ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java @@ -16,6 +16,9 @@ public class DepartStatisticsSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java index 13c67a6d..9b310b31 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java @@ -44,6 +44,9 @@ public class PrincipalPeopleDetailSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java index 4a5dd9ef..83b6ef61 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java @@ -32,6 +32,9 @@ public class PrincipalPeopleSearch { @ApiModelProperty(value = "确认年份") private String paymentYear; + @ApiModelProperty(value = "确认月份") + private String paymentMonth; + @ApiModelProperty(value = "字段") private String column; From fe25355cf652af615945d0deabb9f5dbaf8aad4c Mon Sep 17 00:00:00 2001 From: zhangqinlin <> Date: Wed, 13 Jul 2022 10:23:37 +0800 Subject: [PATCH 02/28] =?UTF-8?q?fix:=E5=AF=BC=E5=87=BA=E7=A1=AE=E6=94=B6?= =?UTF-8?q?=E7=8E=87=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/statistics/entity/CompanyComeMoneyList.java | 8 +++++--- .../java/com/jero/statistics/entity/DepartStatistics.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java index 0595d3ed..2598e8b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java @@ -26,6 +26,10 @@ public class CompanyComeMoneyList { @ApiModelProperty(value = "确认收入金额") private String confirmAmount; + @Excel(name = "确收率", width = 15) + @ApiModelProperty(value = "确收率") + private String finishRate; + @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; @@ -34,7 +38,5 @@ public class CompanyComeMoneyList { @ApiModelProperty(value = "到账总金额") private String comeAllMoney; - @Excel(name = "确收率", width = 15) - @ApiModelProperty(value = "确收率") - private String finishRate; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java index d543bff1..fbdcee57 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java @@ -22,6 +22,10 @@ public class DepartStatistics { @ApiModelProperty(value = "确认收入金额") private String confirmAmount; + @Excel(name = "确收率", width = 15) + @ApiModelProperty(value = "确收率") + private String finishRate; + @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; @@ -30,9 +34,7 @@ public class DepartStatistics { @ApiModelProperty(value = "到账总金额") private String comeAllMoney; - @Excel(name = "确收率", width = 15) - @ApiModelProperty(value = "确收率") - private String finishRate; + } From 2c7c082fbedf821f21f66cb3e562f845a2f914e7 Mon Sep 17 00:00:00 2001 From: zhangqinlin <> Date: Wed, 13 Jul 2022 18:29:14 +0800 Subject: [PATCH 03/28] fix:bug --- .../java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index a38295e2..817e7126 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -532,6 +532,9 @@ and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{allProjectStatisticsSearch.paymentYear}, '%') + + and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{allProjectStatisticsSearch.paymentMonth}, '%') + and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%') From 76e35ce69348c704bc91bb2645ed1d9d666260f0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 18 Jul 2022 13:49:42 +0800 Subject: [PATCH 04/28] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=AF=BC=E5=87=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 2 +- .../jero/meeting/vo/excel/StandardsSituationExcel.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 6ad3349c..504925ed 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -42,7 +42,7 @@ from (SELECT pwgs.id, 2 as type, pwgs.invoice_amount AS billMoney, confirm_amount as confirmAmount, - GROUP_CONCAT(pwgsc.contacts_temporary_name) as contactsName, + GROUP_CONCAT(pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) as contactsName, pwgs.create_time as createTime FROM pay_working_group pwg right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java index 97dee4d9..b5ab4e0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java @@ -1,9 +1,13 @@ package com.jero.meeting.vo.excel; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import java.math.BigDecimal; + /** * @author liJiaRao * @date 2021-09-22 15:40 @@ -64,6 +68,12 @@ public class StandardsSituationExcel extends SituationBaseExcel { @Excel(name = "邮编", width = 15) private String postCode; + /** + * 应收金额 + */ + @Excel(name = "应收金额", width = 15) + private BigDecimal amountReceivable; + /**缴费方式*/ @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") private Integer payMode; From 1c81ec5b7a118c07450b6fc2e6140e6997bd9720 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 20 Jul 2022 14:42:26 +0800 Subject: [PATCH 05/28] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A7=86=E5=9B=BE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 27 +++++- .../mapper/xml/PayWorkingGroupMapper.xml | 84 +++++++------------ 2 files changed, 54 insertions(+), 57 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 504925ed..edcc5b2e 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -214,4 +214,29 @@ alter table pay_meeting_situation alter table tb_member_project_subitem add column confirm_amount decimal(12, 2) default 0 null comment '确认金额'; alter table tb_certificate_payment - add column confirm_amount decimal(12, 2) default 0 null comment '确认金额'; \ No newline at end of file + add column confirm_amount decimal(12, 2) default 0 null comment '确认金额'; +-- 新增税额和未税金额 +alter table pay_payment_record + add column tax decimal(12, 2) default 0 comment '税额', + add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; +alter table pay_mail_bill + add column tax decimal(12, 2) default 0 comment '税额', + add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; +alter table pay_confirm_payment_record + add column tax decimal(12, 2) default 0 comment '税额', + add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; +-- 处理历史数据 +update pay_payment_record +set no_tax_amount = amount_received / 1.06, + tax = amount_received - no_tax_amount +where amount_received is not null; + +update pay_mail_bill +set no_tax_amount = invoice_amount / 1.06, + tax = invoice_amount - no_tax_amount +where invoice_amount is not null; + +update pay_confirm_payment_record +set no_tax_amount = amount_received / 1.06, + tax = amount_received - no_tax_amount +where amount_received is not null; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 817e7126..aee470ab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -140,13 +140,11 @@ projectName as workGroup, sum(allMoney) as allMoney, sum(comeAllMoney) as comeAllMoney, - if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, + sum(billMoney) as billMoney, sum(confirmAmount) as confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) type = 2 @@ -225,12 +223,10 @@ projectName as workGroup, sum(allMoney) as allMoney, sum(comeAllMoney) as comeAllMoney, - if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, + sum(billMoney) as billMoney, sum(confirmAmount) as confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) type = 2 @@ -375,12 +371,10 @@ createTime, packText, pack, - if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, + billMoney, confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) principalNameId in @@ -473,12 +467,10 @@ select * from( select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack, - pmb.invoice_amount as billMoney, + billMoney, confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} @@ -2090,12 +2068,10 @@ chargeUse, packText, pack, - pmb.invoice_amount as billMoney, + billMoney, confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} @@ -2159,12 +2135,10 @@ sum(allMoney) as allMoney, sum(comeAllMoney) as comeAllMoney, depart as departName, - if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney, + sum(billMoney) as billMoney, sum(confirmAmount) as confirmAmount from v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) #{item} @@ -2212,12 +2186,10 @@ select *, - CONCAT(CAST(ROUND((confirmAmount/allMoney)*100,2) AS CHAR),'%') AS moneyRate + CONCAT(CAST(ROUND((confirmAmount1/allMoney)*100,2) AS CHAR),'%') AS moneyRate from ( select superId as id, projectName as workGroup, sum(allMoney) as allMoney, - sum(comeAllMoney) as comeAllMoney, - sum(billMoney) as billMoney, - sum(confirmAmount) as confirmAmount + sum(paidNoTaxAmount) as comeAllMoney, + sum(invoiceNoTaxAmount) as billMoney, + sum(confirmNoTaxAmount) as confirmAmount, + sum(confirmAmount) as confirmAmount1 from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -222,9 +223,9 @@ select superId as id, projectName as workGroup, sum(allMoney) as allMoney, - sum(comeAllMoney) as comeAllMoney, - sum(billMoney) as billMoney, - sum(confirmAmount) as confirmAmount + sum(paidNoTaxAmount) as comeAllMoney, + sum(invoiceNoTaxAmount) as billMoney, + sum(confirmNoTaxAmount) as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -365,14 +366,14 @@ principalName, chargeCompanyTemporaryName, allMoney, - comeAllMoney, + paidNoTaxAmount as comeAllMoney, chargeUse, depart, createTime, packText, pack, - billMoney, - confirmAmount + invoiceNoTaxAmount as billMoney, + confirmNoTaxAmount as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -463,12 +464,13 @@ + select * from( - select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack, - billMoney, - confirmAmount + select projectId,projectName,allMoney,chargeUse,packText,pack, + paidNoTaxAmount as comeAllMoney, + invoiceNoTaxAmount as billMoney, + confirmNoTaxAmount as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2064,12 +2071,12 @@ select projectId, projectName, allMoney, - comeAllMoney, + paidNoTaxAmount as comeAllMoney, chargeUse, packText, pack, - billMoney, - confirmAmount + invoiceNoTaxAmount as billMoney, + confirmNoTaxAmount as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2128,15 +2135,17 @@ comeAllMoney, departName, billMoney, - CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, - confirmAmount + CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, + confirmAmount, + confirmAmount1 from (select sum(allMoney) as allMoney, - sum(comeAllMoney) as comeAllMoney, + sum(paidNoTaxAmount) as comeAllMoney, depart as departName, - sum(billMoney) as billMoney, - sum(confirmAmount) as confirmAmount + sum(invoiceNoTaxAmount) as billMoney, + sum(confirmNoTaxAmount) as confirmAmount, + sum(confirmAmount) as confirmAmount1 from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2185,9 +2194,9 @@ + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java index 778283ec..695fb73a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java @@ -7,11 +7,15 @@ import org.jeecgframework.poi.excel.annotation.Excel; @Data public class AllMoney { + private String allMoney; + @ApiModelProperty("到账金额未税") private String comeAllMoney; + @ApiModelProperty("开票金额未税") private String billMoney; + @ApiModelProperty("确认金额未税") private String confirmAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index 03149b6f..7f48ed85 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import java.util.Date; + /** * @author zql * @date 2021/9/17 18:04 @@ -61,4 +63,8 @@ public class AllProjectStatistics { @Excel(name = "项目负责人", width = 15) @ApiModelProperty(value = "项目负责人") private String principalName; + + @Excel(name = "到账时间", width = 15) + @ApiModelProperty(value = "到账时间") + private Date paymentDate; } From d8be00fbf226fac6acd16d77bfb27db2239f4939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Thu, 28 Jul 2022 18:13:08 +0800 Subject: [PATCH 12/28] =?UTF-8?q?insert=20=E4=BC=9A=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 2 + .../mapper/xml/PayWorkingGroupMapper.xml | 17 ++++ .../service/IPayWorkingGroupService.java | 2 + .../impl/PayWorkingGroupServiceImpl.java | 5 ++ .../AllProjectMoneyStatisticsController.java | 78 +++++++++++++++++++ .../entity/AllProjectStatistics.java | 2 +- 6 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 512b5403..f77aac60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -217,4 +217,6 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListDepartment(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); + + IPage queryPageListAllProjectMoney(Page page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index bc39a471..cca9c9c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2216,4 +2216,21 @@ + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 6c735273..601ae7d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -238,4 +238,6 @@ public interface IPayWorkingGroupService extends IService { List queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List idList); AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); + + IPage queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index c2efb540..4a08c688 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -630,4 +630,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageListAllProjectMoney(page,allProjectStatisticsSearch,idList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java new file mode 100644 index 00000000..4ee33f80 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -0,0 +1,78 @@ +package com.jero.statistics.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.statistics.entity.AllMoney; +import com.jero.statistics.entity.AllProjectStatistics; +import com.jero.statistics.entity.AllProjectStatisticsSearch; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.text.DecimalFormat; +import java.util.HashMap; + +/** + * @Description: TODO + * @author: Kuang Kaixing + * @date: 2022/07/28 16:13 + */ +@Api(tags = "全所收入统计") +@RestController +@RequestMapping("/statistics/allProjectMoneyStatistics") +@Slf4j +public class AllProjectMoneyStatisticsController { + @Resource + private SysUserMapper userMapper; + @Autowired + private ISysDepartService sysDepartService; + @Autowired + private ISysBaseAPI sysBaseAPI; + @Autowired + private ISysUserService sysUserService; + @Autowired + private IPayWorkingGroupService payWorkingGroupService; + + /** + * 分页列表查询 + * + * @param allProjectStatisticsSearch 全所收入统计搜索 + * @param pageNo 页数 + * @param pageSize 条数 + */ + @ApiOperation(value = "全所收入统计搜索-分页列表查询", notes = "全所收入统计搜索-详情分页列表查询") + @GetMapping(value = "/list") + public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupService.queryPageListAllProjectMoney(page, allProjectStatisticsSearch, null); + HashMap hashMap = new HashMap<>(); + + AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch, null); + + hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); + hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney()); + hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount()); + hashMap.put("pageList", pageList); + return Result.OK(hashMap); + + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index 7f48ed85..d5c029f8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -66,5 +66,5 @@ public class AllProjectStatistics { @Excel(name = "到账时间", width = 15) @ApiModelProperty(value = "到账时间") - private Date paymentDate; + private String paymentDate; } From e224733e9caf01d570a7d5c67d10349b18c08f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Fri, 29 Jul 2022 11:40:01 +0800 Subject: [PATCH 13/28] =?UTF-8?q?update=20=E4=BC=9A=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 2 +- .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../service/IPayWorkingGroupService.java | 2 +- .../impl/PayWorkingGroupServiceImpl.java | 18 ++++++++++++++-- .../AllProjectMoneyStatisticsController.java | 21 +++++++++---------- .../entity/AllProjectStatistics.java | 11 ++++++++++ 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index f77aac60..aa023a1a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -218,5 +218,5 @@ public interface PayWorkingGroupMapper extends BaseMapper { AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); - IPage queryPageListAllProjectMoney(Page page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); + List queryListAllProjectMoney(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index cca9c9c4..e2c6eb10 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2217,7 +2217,7 @@ - select sum(paidNoTaxAmount) as comeAllMoney, sum(invoiceNoTaxAmount) as billMoney, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 601ae7d7..28ac3da6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -239,5 +239,5 @@ public interface IPayWorkingGroupService extends IService { AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); - IPage queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); + List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 4a08c688..c2a88439 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -632,7 +632,21 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { - return payWorkingGroupMapper.queryPageListAllProjectMoney(page,allProjectStatisticsSearch,idList); + public List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + List list = payWorkingGroupMapper.queryListAllProjectMoney(allProjectStatisticsSearch,idList); + List collect=list.stream() + .map(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1])) + .collect(Collectors.toList()); + + String paymentYear=allProjectStatisticsSearch.getPaymentYear(); + for (int i=1; i <=12 ; i++) { + if(!collect.contains(i)){ + StringBuilder stringBuilder = new StringBuilder().append(paymentYear); + AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00","0.00","0.00",stringBuilder.append("-"+i).toString()); + list.add(allProjectStatistics); + } + } + list.sort(Comparator.comparing(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1]))); + return list; } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java index 4ee33f80..e046312e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -12,6 +12,7 @@ import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.AllMoney; import com.jero.statistics.entity.AllProjectStatistics; import com.jero.statistics.entity.AllProjectStatisticsSearch; +import com.mchange.lang.IntegerUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +26,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.text.DecimalFormat; -import java.util.HashMap; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; /** * @Description: TODO @@ -52,26 +56,21 @@ public class AllProjectMoneyStatisticsController { * 分页列表查询 * * @param allProjectStatisticsSearch 全所收入统计搜索 - * @param pageNo 页数 - * @param pageSize 条数 */ @ApiOperation(value = "全所收入统计搜索-分页列表查询", notes = "全所收入统计搜索-详情分页列表查询") @GetMapping(value = "/list") - public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch) { + + List list = payWorkingGroupService.queryListAllProjectMoney(allProjectStatisticsSearch, null); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListAllProjectMoney(page, allProjectStatisticsSearch, null); HashMap hashMap = new HashMap<>(); - AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch, null); - hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney()); hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount()); - hashMap.put("pageList", pageList); + hashMap.put("list", list); + return Result.OK(hashMap); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index d5c029f8..703e3bf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -2,7 +2,9 @@ package com.jero.statistics.entity; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; @@ -12,6 +14,8 @@ import java.util.Date; * @date 2021/9/17 18:04 */ @Data +@AllArgsConstructor +@NoArgsConstructor public class AllProjectStatistics { @ApiModelProperty(value = "项目id") private String projectId; @@ -67,4 +71,11 @@ public class AllProjectStatistics { @Excel(name = "到账时间", width = 15) @ApiModelProperty(value = "到账时间") private String paymentDate; + + public AllProjectStatistics(String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) { + this.confirmAmount=confirmAmount; + this.billMoney=billMoney; + this.comeAllMoney=comeAllMoney; + this.paymentDate=paymentDate; + } } From cd846375530e31d777ad37a443f537392019a01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Fri, 29 Jul 2022 16:04:32 +0800 Subject: [PATCH 14/28] =?UTF-8?q?insert=20=E4=BC=9A=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IPayWorkingGroupService.java | 4 +- .../impl/PayWorkingGroupServiceImpl.java | 55 ++++++++++++++-- .../AllProjectMoneyStatisticsController.java | 19 +++++- .../entity/AllProjectMoneyExcel.java | 65 +++++++++++++++++++ 4 files changed, 137 insertions(+), 6 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 28ac3da6..e2c446c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -239,5 +239,7 @@ public interface IPayWorkingGroupService extends IService { AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); - List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); + List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); + + List queryListAllProjectMoneyExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index c2a88439..e44fb033 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -35,6 +35,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -634,19 +635,65 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { List list = payWorkingGroupMapper.queryListAllProjectMoney(allProjectStatisticsSearch,idList); + return getAllProjectMoneyStatistics(allProjectStatisticsSearch, list); + } + + @Override + public List queryListAllProjectMoneyExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + List list = payWorkingGroupMapper.queryListAllProjectMoney(allProjectStatisticsSearch,idList); + List list2=getAllProjectMoneyStatistics(allProjectStatisticsSearch, list); + AllMoney allMoney=payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList); + + List comeAllMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getComeAllMoney()).collect(Collectors.toList()); + List billMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getBillMoney()).collect(Collectors.toList()); + List confirmMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getConfirmAmount()).collect(Collectors.toList()); + List> list3 = new ArrayList<>(); + list3.add(0,comeAllMoneyList); + list3.add(1,billMoneyList); + list3.add(2,confirmMoneyList); + + AllProjectMoneyExcel comeAllProjectMoney=new AllProjectMoneyExcel("到账金额",allMoney.getComeAllMoney()); + AllProjectMoneyExcel billAllProjectMoney=new AllProjectMoneyExcel("开票金额",allMoney.getBillMoney()); + AllProjectMoneyExcel confirmAllProjectMoney=new AllProjectMoneyExcel("确认收入金额",allMoney.getConfirmAmount()); + List excelList = new ArrayList<>(); + excelList.add(0,comeAllProjectMoney); + excelList.add(1,billAllProjectMoney); + excelList.add(2,confirmAllProjectMoney); + + for (int i=0; i < excelList.size(); i++) { + excelList.get(i).setJanuary(list3.get(i).get(0)); + excelList.get(i).setFebruary(list3.get(i).get(1)); + excelList.get(i).setMarch(list3.get(i).get(2)); + excelList.get(i).setApril(list3.get(i).get(3)); + excelList.get(i).setMay(list3.get(i).get(4)); + excelList.get(i).setJune(list3.get(i).get(5)); + excelList.get(i).setJuly(list3.get(i).get(6)); + excelList.get(i).setAugust(list3.get(i).get(7)); + excelList.get(i).setSeptember(list3.get(i).get(8)); + excelList.get(i).setOctober(list3.get(i).get(9)); + excelList.get(i).setNovember(list3.get(i).get(10)); + excelList.get(i).setDecember(list3.get(i).get(11)); + } + return excelList; + } + + @NotNull + private List getAllProjectMoneyStatistics(AllProjectStatisticsSearch allProjectStatisticsSearch, List list) { List collect=list.stream() .map(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1])) .collect(Collectors.toList()); String paymentYear=allProjectStatisticsSearch.getPaymentYear(); - for (int i=1; i <=12 ; i++) { - if(!collect.contains(i)){ - StringBuilder stringBuilder = new StringBuilder().append(paymentYear); - AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00","0.00","0.00",stringBuilder.append("-"+i).toString()); + for (int i=1; i <= 12; i++) { + if (!collect.contains(i)) { + StringBuilder stringBuilder=new StringBuilder().append(paymentYear); + AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00", "0.00", "0.00", stringBuilder.append("-" + i).toString()); list.add(allProjectStatistics); } } list.sort(Comparator.comparing(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1]))); return list; } + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java index e046312e..2bc8302c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -3,6 +3,7 @@ package com.jero.statistics.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.mapper.SysUserMapper; @@ -10,8 +11,10 @@ import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.AllMoney; +import com.jero.statistics.entity.AllProjectMoneyExcel; import com.jero.statistics.entity.AllProjectStatistics; import com.jero.statistics.entity.AllProjectStatisticsSearch; +import com.jero.util.AmountUtil; import com.mchange.lang.IntegerUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -57,7 +61,7 @@ public class AllProjectMoneyStatisticsController { * * @param allProjectStatisticsSearch 全所收入统计搜索 */ - @ApiOperation(value = "全所收入统计搜索-分页列表查询", notes = "全所收入统计搜索-详情分页列表查询") + @ApiOperation(value = "全所收入统计搜索-列表查询", notes = "全所收入统计搜索-详情列表查询") @GetMapping(value = "/list") public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch) { @@ -74,4 +78,17 @@ public class AllProjectMoneyStatisticsController { return Result.OK(hashMap); } + + + /** + * 所领导统计导出 + */ + @AutoLog(value = "全所收入统计导出-导出统计") + @GetMapping(value = "/excel") + @ApiOperation(value = "全所收入统计导出-导出统计", notes = "全所收入统计导出-导出统计") + public ModelAndView excel(AllProjectStatisticsSearch allProjectStatisticsSearch, + @RequestParam(name = "selections", required = false) String selections) { + List list = payWorkingGroupService.queryListAllProjectMoneyExcel(allProjectStatisticsSearch, null); + return AmountUtil.exportListXls(list, AllProjectMoneyExcel.class, "收入统计"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java new file mode 100644 index 00000000..99fafe42 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java @@ -0,0 +1,65 @@ +package com.jero.statistics.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @Description: 全所收入Excel + * @author: Kuang Kaixing + * @date: 2022/07/29 14:21 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AllProjectMoneyExcel { + + @Excel(name = "类型名称") + private String category; + + @Excel(name="一月") + private String january; + + @Excel(name="二月") + private String february; + + @Excel(name="三月") + private String march; + + @Excel(name="四月") + private String april; + + @Excel(name="五月") + private String may; + + @Excel(name="六月") + private String june; + + @Excel(name="七月") + private String july; + + @Excel(name="八月") + private String august; + + @Excel(name="九月") + private String september; + + @Excel(name="十月") + private String october; + + @Excel(name="十一月") + private String november; + + @Excel(name="十二月") + private String december ; + + @Excel(name="总计") + private String total; + + public AllProjectMoneyExcel(String category, String total) { + this.category=category; + this.total=total; + } + +} From a4b02a35660a648a4ac86aee664df57e348a0341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Fri, 29 Jul 2022 16:50:11 +0800 Subject: [PATCH 15/28] =?UTF-8?q?update=20=E4=BC=9A=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupServiceImpl.java | 8 +++--- .../entity/AllProjectMoneyExcel.java | 28 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index e44fb033..e581f2a9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -648,17 +648,17 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl billMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getBillMoney()).collect(Collectors.toList()); List confirmMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getConfirmAmount()).collect(Collectors.toList()); List> list3 = new ArrayList<>(); - list3.add(0,comeAllMoneyList); + list3.add(0,confirmMoneyList); list3.add(1,billMoneyList); - list3.add(2,confirmMoneyList); + list3.add(2,comeAllMoneyList); AllProjectMoneyExcel comeAllProjectMoney=new AllProjectMoneyExcel("到账金额",allMoney.getComeAllMoney()); AllProjectMoneyExcel billAllProjectMoney=new AllProjectMoneyExcel("开票金额",allMoney.getBillMoney()); AllProjectMoneyExcel confirmAllProjectMoney=new AllProjectMoneyExcel("确认收入金额",allMoney.getConfirmAmount()); List excelList = new ArrayList<>(); - excelList.add(0,comeAllProjectMoney); + excelList.add(0,confirmAllProjectMoney); excelList.add(1,billAllProjectMoney); - excelList.add(2,confirmAllProjectMoney); + excelList.add(2,comeAllProjectMoney); for (int i=0; i < excelList.size(); i++) { excelList.get(i).setJanuary(list3.get(i).get(0)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java index 99fafe42..0b4e9500 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java @@ -15,46 +15,46 @@ import org.jeecgframework.poi.excel.annotation.Excel; @AllArgsConstructor public class AllProjectMoneyExcel { - @Excel(name = "类型名称") + @Excel(name = "合同",width=15,height=15) private String category; - @Excel(name="一月") + @Excel(name="1月",width=15,height=15) private String january; - @Excel(name="二月") + @Excel(name="2月",width=15,height=15) private String february; - @Excel(name="三月") + @Excel(name="3月",width=15,height=15) private String march; - @Excel(name="四月") + @Excel(name="4月",width=15,height=15) private String april; - @Excel(name="五月") + @Excel(name="5月",width=15,height=15) private String may; - @Excel(name="六月") + @Excel(name="6月",width=15,height=15) private String june; - @Excel(name="七月") + @Excel(name="7月",width=15,height=15) private String july; - @Excel(name="八月") + @Excel(name="8月",width=15,height=15) private String august; - @Excel(name="九月") + @Excel(name="9月",width=15,height=15) private String september; - @Excel(name="十月") + @Excel(name="10月",width=15,height=15) private String october; - @Excel(name="十一月") + @Excel(name="11月",width=15,height=15) private String november; - @Excel(name="十二月") + @Excel(name="12月",width=15,height=15) private String december ; - @Excel(name="总计") + @Excel(name="总计",width=15,height=15) private String total; public AllProjectMoneyExcel(String category, String total) { From 6ce83da94396e4f67416d318a95c1b1cd509df0b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Aug 2022 10:50:45 +0800 Subject: [PATCH 16/28] =?UTF-8?q?udpate=20=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E7=A8=8E=E9=A2=9D=EF=BC=8C=E6=9C=AA=E7=A8=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 28 ++++++------- .../jero/mail/entity/PayMailBillProject.java | 14 +++++++ .../meeting/entity/PayMeetingSituation.java | 40 +++++++++++++++++++ .../entity/PayMemberProjectSubitem.java | 38 ++++++++++++++++++ .../member/entity/TbCertificatePayment.java | 38 ++++++++++++++++++ .../member/entity/TbMemberProjectSubitem.java | 40 +++++++++++++++++++ .../entity/PayConfirmPaymentRecord.java | 18 +++++++-- .../jero/payment/entity/PayPaymentRecord.java | 12 ++++++ .../jero/project/entity/PayCommonProject.java | 39 ++++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 39 ++++++++++++++++++ 10 files changed, 288 insertions(+), 18 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 1a2b01ad..3f567a51 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -240,7 +240,7 @@ alter table tb_certificate_payment alter table pay_payment_record add column tax decimal(12, 2) default 0 comment '税额', add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; -alter table pay_mail_bill +alter table pay_mail_bill_project add column tax decimal(12, 2) default 0 comment '税额', add column no_tax_amount decimal(12, 2) default 0 comment '未税金额'; alter table pay_confirm_payment_record @@ -250,50 +250,50 @@ alter table pay_confirm_payment_record alter table pay_common_project add column affirm_income tinyint(1) null comment '确认收入', add column confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + 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 confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + 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 confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + 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 confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + 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 confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + 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 confirm_no_tax_amount decimal(12, 2) default 0 comment '确认金额未税', - add column paid_no_tax_amount decimal(12, 2) default 0 comment '到账金额未税', - add column invoice_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 '到账金额未税', add column paid_tax decimal(12, 2) default 0 comment '到账金额税额', + add column invoice_no_tax_amount decimal(12, 2) default 0 comment '开票金额未税', add column invoice_tax decimal(12, 2) default 0 comment '开票金额税额'; -- 处理历史数据 update pay_payment_record @@ -301,7 +301,7 @@ set no_tax_amount = amount_received / 1.06, tax = amount_received - no_tax_amount where amount_received is not null; -update pay_mail_bill +update pay_mail_bill_project set no_tax_amount = invoice_amount / 1.06, tax = invoice_amount - no_tax_amount where invoice_amount is not null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java index 4bdfe35e..d42a8461 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java @@ -52,6 +52,20 @@ public class PayMailBillProject implements Serializable { @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /**税额*/ + @Excel(name = "税额", width = 15) + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; + /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 3220aec9..af13b989 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -460,4 +460,44 @@ public class PayMeetingSituation implements Serializable { @TableField(exist = false) @Dict(dicCode = "sign_up_status") private Integer signUpStatus; + + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 55a38be3..2a093de7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -297,4 +297,42 @@ public class PayMemberProjectSubitem implements Serializable { @TableField(exist = false) private String email; + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index 79263095..69b505b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -286,4 +286,42 @@ public class TbCertificatePayment implements Serializable { @ApiModelProperty(value = "银行账户") private String bankAccount; + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index f3028ea7..00e32aa0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -258,4 +258,44 @@ public class TbMemberProjectSubitem implements Serializable { /**入会申请表文件id*/ @ApiModelProperty(value = "银行账户") private String bankAccount; + + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java index a4c77d25..b8ca6607 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java @@ -18,13 +18,10 @@ import javax.validation.constraints.DecimalMax; import javax.validation.constraints.NotNull; /** - * + *确认来款记录表 *@author liJiaRao *@date 2022-06-08 17:22 */ -/** - * 确认来款记录表 - */ @ApiModel(value="确认来款记录表") @Data @TableName(value = "pay_confirm_payment_record") @@ -108,6 +105,19 @@ public class PayConfirmPaymentRecord implements Serializable { @ApiModelProperty(value="备注") private String remark; + + /**税额*/ + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; + public static final String COL_ID = "id"; public static final String COL_CREATE_BY = "create_by"; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index b7052918..5edaaf03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -115,4 +115,16 @@ public class PayPaymentRecord implements Serializable { @Dict(dicCode = "meeting_pay_type") @TableField(exist = false) private Integer paymentMethod; + + /**税额*/ + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 61fcb93b..eab079c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -262,4 +262,43 @@ public class PayCommonProject implements Serializable { @TableField(exist = false) private String endAmount; + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 133133d4..eaada7b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -399,4 +399,43 @@ public class PayWorkingGroupSubItem implements Serializable { @Size(max = 50,message = "联系人10备注长度不能大于50个字符") @TableField(exist = false) private String remarksTen; + + @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + private Integer affirmIncome; + + /**确认金额税额*/ + @ApiModelProperty(value = "确认金额税额") + @DecimalMax(value = "9999999999.99",message = "确认金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmTax; + + /**确认金额未税*/ + @ApiModelProperty(value = "确认金额未税") + @DecimalMax(value = "9999999999.99",message = "确认金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmNoTaxAmount; + + /**到账金额税额*/ + @ApiModelProperty(value = "到账金额税额") + @DecimalMax(value = "9999999999.99",message = "到账金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidTax; + + /**到账金额未税*/ + @ApiModelProperty(value = "到账金额未税") + @DecimalMax(value = "9999999999.99",message = "到账金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal paidNoTaxAmount; + + /**开票金额税额*/ + @ApiModelProperty(value = "开票金额税额") + @DecimalMax(value = "9999999999.99",message = "开票金额税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceTax; + + /**开票金额未税*/ + @ApiModelProperty(value = "开票金额未税") + @DecimalMax(value = "9999999999.99",message = "开票金额未税") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceNoTaxAmount; } From 31d16c084d8384b7f995ab924f2dffa7a40230f5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Aug 2022 11:53:33 +0800 Subject: [PATCH 17/28] =?UTF-8?q?add=20=E7=A8=8E=E9=A2=9D=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPaymentRecordServiceImpl.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index aba8a690..b2315a13 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -75,6 +75,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -329,6 +330,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl listId = new ArrayList<>(); //累加主列表实收金额 @@ -759,6 +764,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl Date: Mon, 1 Aug 2022 15:44:59 +0800 Subject: [PATCH 18/28] =?UTF-8?q?[update]=20-2022=E5=B9=B48=E6=9C=881?= =?UTF-8?q?=E6=97=A5=20=E5=A2=9E=E5=8A=A0=E5=85=A8=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97=E7=9A=84sql;?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index 98025ed6..7d7c556b 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -257,4 +257,9 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1535559127371321346', '1535558715796852737', '查询', '', NULL, NULL, NULL, 2, 'departmentAllStatistics:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-06-11 17:46:40', NULL, NULL, 0, 0, '1', 0); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1535559323643777026', '1535558715796852737', '导出', '', NULL, NULL, NULL, 2, 'departmentAllStatistics:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-06-11 17:47:27', NULL, NULL, 0, 0, '1', 0); +-- 2022年8月1日 增加全所收入统计模块的sql;增加打包管理模块确认收入按钮的sql +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1553998336251633666', '1553997970898395138', '导出', NULL, NULL, NULL, NULL, 2, 'wholePaymentsStatistics:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-08-01 14:57:30', NULL, NULL, 0, 0, '1', 0); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1553998246489333762', '1553997970898395138', '查询', NULL, NULL, NULL, NULL, 2, 'wholePaymentsStatistics:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-08-01 14:57:09', NULL, NULL, 0, 0, '1', 0); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1553997970898395138', '1437320526513905666', '全所收入统计', '/statisticalReport/WholePaymentsStatistics', 'statisticalReport/WholePaymentsStatistics', NULL, NULL, 1, NULL, '1', 10.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2022-08-01 14:56:03', NULL, NULL, 0, 0, '1', 0); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1553987184549404674', '1435493270476906497', '确认收入', NULL, NULL, NULL, NULL, 2, 'packProject:confirmPayment', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-08-01 14:13:11', NULL, NULL, 0, 0, '1', 0); From 5561ee0f726bf5ade848ee0652a1b6999e3f0826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Mon, 1 Aug 2022 15:51:58 +0800 Subject: [PATCH 19/28] =?UTF-8?q?update=20=E5=85=A8=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllProjectMoneyStatisticsController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java index 2bc8302c..db5ba355 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -61,6 +61,7 @@ public class AllProjectMoneyStatisticsController { * * @param allProjectStatisticsSearch 全所收入统计搜索 */ + @RequiresPermissions("wholeInstituteStatistics:search") @ApiOperation(value = "全所收入统计搜索-列表查询", notes = "全所收入统计搜索-详情列表查询") @GetMapping(value = "/list") public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch) { @@ -83,6 +84,7 @@ public class AllProjectMoneyStatisticsController { /** * 所领导统计导出 */ + @RequiresPermissions("wholeInstituteStatistics:export") @AutoLog(value = "全所收入统计导出-导出统计") @GetMapping(value = "/excel") @ApiOperation(value = "全所收入统计导出-导出统计", notes = "全所收入统计导出-导出统计") From 0c4681cd88b24a172bd8d8eaab0090206e25043c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Aug 2022 17:53:55 +0800 Subject: [PATCH 20/28] =?UTF-8?q?add=20=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=E7=A8=8E=E9=A2=9D=E5=B0=B1=E5=AD=98?= =?UTF-8?q?=E5=85=A5=E9=BB=98=E8=AE=A4=E7=A8=8E=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPaymentRecordServiceImpl.java | 73 ++++++++++++++++--- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index b2315a13..25eef66a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.payment.service.impl; +import com.alibaba.druid.sql.visitor.functions.If; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -74,6 +75,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.validation.constraints.DecimalMax; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; @@ -204,6 +206,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl list,Integer flag,String checkOrRecord){ List typr5List = new ArrayList<>(); List typr6List = new ArrayList<>(); + //如果没有填写税额就存入默认税额 + list.forEach(payPaymentRecord ->{ + BigDecimal noTaxAmount1 = payPaymentRecord.getNoTaxAmount(); + BigDecimal tax1 = payPaymentRecord.getTax(); + if (noTaxAmount1 == null || tax1 == null){ + BigDecimal amountReceived = payPaymentRecord.getAmountReceived(); + BigDecimal noTaxAmount = amountReceived.divide(new BigDecimal("1.06"), 2, RoundingMode.HALF_UP); + BigDecimal tax = amountReceived.subtract(noTaxAmount); + payPaymentRecord.setNoTaxAmount(noTaxAmount); + payPaymentRecord.setTax(tax); + } + }); for(PayPaymentRecord payPaymentRecord : list){ addOneAmountReceived(payPaymentRecord,typr5List,typr6List,flag,checkOrRecord); @@ -352,6 +366,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl listId = new ArrayList<>(); + BigDecimal divide = payPaymentRecord.getAmountReceived().divide(new BigDecimal("1.06"), 2, RoundingMode.HALF_UP); //累加主列表实收金额 //来款条件校验 amountReceivedVerification( payPaymentRecord, flag); @@ -372,7 +387,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 10:38:29 +0800 Subject: [PATCH 21/28] =?UTF-8?q?add=20=E5=BC=80=E7=A5=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/mail/PayMailBillVO.java | 16 ++ .../mail/mapper/xml/PayMailBillMapper.xml | 2 +- .../service/impl/PayMailBillServiceImpl.java | 138 ++++++++++++++++-- .../service/IPayPaymentRecordService.java | 5 + .../impl/PayPaymentRecordServiceImpl.java | 3 +- 5 files changed, 150 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java index 0360bb3e..1483f61b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java @@ -3,10 +3,12 @@ package com.jero.mail; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.NotBlank; @@ -28,4 +30,18 @@ public class PayMailBillVO extends PayMailBill { @TableField(exist = false) @ApiModelProperty(value = "bmpId") private java.lang.String bmpId; + + /**税额*/ + @Excel(name = "税额", width = 15) + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index e4d817e3..d8ca5ae0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -45,7 +45,7 @@ + select sum(amount_received) as amount_received, + sum(tax) as tax, + sum(no_tax_amount) as no_tax_amount + from pay_confirm_payment_record + where project_id = #{projectId,jdbcType=VARCHAR} + group by project_id + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index 17c71381..ecd99f41 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -5,11 +5,11 @@ - select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.charge_company_temporary_id + select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.charge_company_temporary_id, + p.confirm_amount from ( select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,c.charge_company_temporary_id + ,c.confirm_amount from pay_common_project c left join sys_user su on c.principal_id = su.id where @@ -255,7 +257,8 @@ UNION ALL - select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsub.charge_company_temporary_id + select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsub.charge_company_temporary_id, + gsub.confirm_amount from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id @@ -286,7 +289,8 @@ UNION ALL - select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.company_id + select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.company_id, + sit.confirm_amount from pay_meeting meeting left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id @@ -317,7 +321,8 @@ UNION ALL - select msub.id,member.project_name,msub.charge_use,member.director_id,su.realname,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.company_temporary_id + select msub.id,member.project_name,msub.charge_use,member.director_id,su.realname,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.company_temporary_id, + msub.confirm_amount from pay_member_project member left join sys_user su on member.director_id = su.id inner join pay_member_project_subitem msub on member.id=msub.project_id @@ -348,7 +353,8 @@ UNION ALL - select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.company_id + select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.company_id, + tmsub.confirm_amount from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id @@ -379,7 +385,8 @@ UNION ALL - select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.company_id + select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.company_id, + tcp.confirm_amount from tb_member_project tmember inner join tb_certificate_payment tcp on tmember.id=tcp.project_id left join sys_user su on su.id = tmember.director_id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index eab079c8..ca4b4bee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -103,6 +103,7 @@ public class PayCommonProject implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; + @Excel(name = "确认到账金额（元）", width = 15,orderNum = "6") @ApiModelProperty(value = "确认到账金额（元）") @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) From 70c03048b7facab7105a8ab66d6347582777bb46 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Aug 2022 14:43:20 +0800 Subject: [PATCH 24/28] =?UTF-8?q?add=20=E6=9B=B4=E6=96=B0=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayConfirmPaymentRecordController.java | 10 ++++ .../impl/PayConfirmPaymentRecordService.java | 58 +++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java index 5da4c470..9ff76b41 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java @@ -124,6 +124,16 @@ public class PayConfirmPaymentRecordController extends JeroController updateAffirmIncome() { + payConfirmPaymentRecordService.updateAffirmIncome(); + return Result.OK(); + } + /** * 导出excel */ 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 48525902..4436c4f2 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 @@ -3,6 +3,8 @@ package com.jero.payment.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.jero.common.enums.PaymentStatusEnum; import com.jero.company.entity.PayContactsManagement; import com.jero.contract.common.PayIncomeContractCommon; @@ -204,6 +206,62 @@ public class PayConfirmPaymentRecordService extends ServiceImpl ids) { removeByIds(ids); } + + public void updateAffirmIncome() { + payCommonProjectMapper.selectList(new QueryWrapper<>()).forEach(p->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); + PayCommonProject project = new PayCommonProject(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + payCommonProjectMapper.updateById(project); + }); + + payWorkingGroupSubItemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); + PayWorkingGroupSubItem project = new PayWorkingGroupSubItem(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + payWorkingGroupSubItemMapper.updateById(project); + }); + + payMeetingSituationMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + PayMeetingSituation project = new PayMeetingSituation(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + payMeetingSituationMapper.updateById(project); + }); + + payMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + PayMemberProjectSubitem project = new PayMemberProjectSubitem(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + payMemberProjectSubitemMapper.updateById(project); + }); + + tbMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + TbMemberProjectSubitem project = new TbMemberProjectSubitem(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + tbMemberProjectSubitemMapper.updateById(project); + }); + + certificatePaymentMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + BigDecimal confirmAmount = p.getConfirmAmount(); + Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); + TbCertificatePayment project = new TbCertificatePayment(); + project.setId(p.getId()); + project.setAffirmIncome(affirmIncome); + certificatePaymentMapper.updateById(project); + }); + } } From 0cc2f47df15bb935c284c57cf84ad0e734a7907d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Aug 2022 15:08:07 +0800 Subject: [PATCH 25/28] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=84=E7=90=86=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=A1=AE=E8=AE=A4=E6=9D=A5=E6=AC=BE=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E8=A1=A8=E7=9A=84=E7=A8=8E=E9=A2=9D=E4=B8=BA?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 42 ++++++++++++--- .../mapper/PayConfirmPaymentRecordMapper.java | 3 +- .../mapper/PayPaymentRecordMapper.java | 6 ++- .../xml/PayConfirmPaymentRecordMapper.xml | 8 +++ .../mapper/xml/PayPaymentRecordMapper.xml | 50 +++++++++++++++++ .../impl/PayConfirmPaymentRecordService.java | 54 +++++++++++-------- 6 files changed, 134 insertions(+), 29 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 3f567a51..02d26bae 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -318,7 +318,7 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where need_invoice != 0; update pay_working_group_subitem set confirm_no_tax_amount = confirm_amount / 1.06, paid_no_tax_amount = paid_amount / 1.06, @@ -326,7 +326,7 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where need_invoice != 0; update pay_member_project_subitem set confirm_no_tax_amount = confirm_amount / 1.06, paid_no_tax_amount = paid_amount / 1.06, @@ -334,7 +334,7 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where need_invoice != 0; update pay_meeting_situation set confirm_no_tax_amount = confirm_amount / 1.06, paid_no_tax_amount = paid_amount / 1.06, @@ -342,7 +342,7 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where need_invoice != 0; update tb_member_project_subitem set confirm_no_tax_amount = confirm_amount / 1.06, paid_no_tax_amount = paid_amount / 1.06, @@ -350,7 +350,7 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where invoice_requirements != 0; update tb_certificate_payment set confirm_no_tax_amount = confirm_amount / 1.06, paid_no_tax_amount = paid_amount / 1.06, @@ -358,7 +358,37 @@ set confirm_no_tax_amount = confirm_amount / 1.06, confirm_tax = confirm_amount - confirm_no_tax_amount, paid_tax = paid_amount - paid_no_tax_amount, invoice_tax = invoice_amount - invoice_no_tax_amount -where 1 = 1; +where invoice_requirements != 0; +update pay_common_project +set confirm_no_tax_amount = confirm_amount , + paid_no_tax_amount = paid_amount , + invoice_no_tax_amount = invoice_amount +where need_invoice = 0; +update pay_working_group_subitem +set confirm_no_tax_amount = confirm_amount, + paid_no_tax_amount = paid_amount, + invoice_no_tax_amount = invoice_amount +where need_invoice = 0; +update pay_member_project_subitem +set confirm_no_tax_amount = confirm_amount , + paid_no_tax_amount = paid_amount , + invoice_no_tax_amount = invoice_amount +where need_invoice = 0; +update pay_meeting_situation +set confirm_no_tax_amount = confirm_amount , + paid_no_tax_amount = paid_amount , + invoice_no_tax_amount = invoice_amount +where need_invoice = 0; +update tb_member_project_subitem +set confirm_no_tax_amount = confirm_amount , + paid_no_tax_amount = paid_amount , + invoice_no_tax_amount = invoice_amount +where invoice_requirements = 0; +update tb_certificate_payment +set confirm_no_tax_amount = confirm_amount , + paid_no_tax_amount = paid_amount , + invoice_no_tax_amount = invoice_amount +where invoice_requirements = 0; select * from v_statistical; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayConfirmPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayConfirmPaymentRecordMapper.java index 69ac80b1..84484481 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayConfirmPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayConfirmPaymentRecordMapper.java @@ -1,4 +1,5 @@ package com.jero.payment.mapper; +import java.math.BigDecimal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.member.entity.TbCertificatePayment; @@ -15,6 +16,6 @@ public interface PayConfirmPaymentRecordMapper extends BaseMapper selectByProjectId(@Param("projectId")String projectId); PayConfirmPaymentRecord selectOneByProjectIdAndProjectType(@Param("projectId")String projectId,@Param("projectType")String projectType); - + int updateZeroTaxByProjectId(@Param("projectId")String projectId); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index 5cac4227..27263d87 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -1,11 +1,11 @@ package com.jero.payment.mapper; +import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.payment.entity.PayPaymentRecord; import com.jero.project.entity.PayCommonProject; import com.jero.project.vo.PayCommonProjectOutput; -import io.lettuce.core.dynamic.annotation.Param; import java.math.BigDecimal; import java.util.List; @@ -61,4 +61,8 @@ public interface PayPaymentRecordMapper extends BaseMapper { * @Exception */ Integer getMonthProjectCount(String time); + + int updateZeroTaxByProjectId(@Param("projectId")String projectId); + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayConfirmPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayConfirmPaymentRecordMapper.xml index 196f1bba..6e262c4f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayConfirmPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayConfirmPaymentRecordMapper.xml @@ -40,4 +40,12 @@ and project_type = #{projectType} group by project_id + + + + update pay_confirm_payment_record + set no_tax_amount = amount_received, + tax = 0 + where project_id = #{projectId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index 402c094b..d73a9d1c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -3,6 +3,48 @@ + + id, + project_id, + project_type, + amount_received, + payment_date, + proof, + remark, + create_by, + create_time, + update_by, + update_time, + applicant_name, + payment_status, + reviewer_id, + reviewer_name, + review_time, + review_instructions, + tax, + no_tax_amount + + + + + + + + + + + + + + + + + + + + + + select count(*) from (select * from pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time} group by project_id) aa + + + + update pay_payment_record + set no_tax_amount=amount_received, + tax = 0 + where project_id = #{projectId} + 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 4436c4f2..0ae7e4a5 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 @@ -1,43 +1,29 @@ package com.jero.payment.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.jero.common.enums.PaymentStatusEnum; -import com.jero.company.entity.PayContactsManagement; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.member.entity.*; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.payment.mapper.PayPaymentRecordMapper; import com.jero.payment.service.IPayPaymentRecordService; -import com.jero.payment.vo.TbCheckVo; -import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; -import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; -import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; -import com.jero.temporary.entity.PayContactsManagementTemporary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.payment.entity.PayConfirmPaymentRecord; import com.jero.payment.mapper.PayConfirmPaymentRecordMapper; -import org.springframework.util.CollectionUtils; /** * @author liJiaRao @@ -59,6 +45,8 @@ public class PayConfirmPaymentRecordService extends ServiceImpl()).forEach(p->{ + payCommonProjectMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); PayCommonProject project = new PayCommonProject(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); payCommonProjectMapper.updateById(project); + if (p.getNeedInvoice() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); - payWorkingGroupSubItemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + payWorkingGroupSubItemMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getReceivableAmount(), confirmAmount); PayWorkingGroupSubItem project = new PayWorkingGroupSubItem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); payWorkingGroupSubItemMapper.updateById(project); + if (p.getNeedInvoice() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); - payMeetingSituationMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + payMeetingSituationMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); PayMeetingSituation project = new PayMeetingSituation(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); payMeetingSituationMapper.updateById(project); + if (p.getNeedInvoice() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); - payMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + payMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); PayMemberProjectSubitem project = new PayMemberProjectSubitem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); payMemberProjectSubitemMapper.updateById(project); + if (p.getNeedInvoice() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); - tbMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + tbMemberProjectSubitemMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); TbMemberProjectSubitem project = new TbMemberProjectSubitem(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); tbMemberProjectSubitemMapper.updateById(project); + if (p.getInvoiceRequirements() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); - certificatePaymentMapper.selectList(new QueryWrapper<>()).forEach(p ->{ + certificatePaymentMapper.selectList(new QueryWrapper<>()).forEach(p -> { BigDecimal confirmAmount = p.getConfirmAmount(); Integer affirmIncome = payPaymentRecordService.getInAccount(p.getAmountReceivable(), confirmAmount); TbCertificatePayment project = new TbCertificatePayment(); project.setId(p.getId()); project.setAffirmIncome(affirmIncome); certificatePaymentMapper.updateById(project); + if (p.getInvoiceRequirements() == 0) { + baseMapper.updateZeroTaxByProjectId(p.getId()); + payPaymentRecordMapper.updateZeroTaxByProjectId(p.getId()); + } }); } } From 1e10417306f43fe498af1b4d73dc29ac58a99a99 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Aug 2022 15:49:55 +0800 Subject: [PATCH 26/28] =?UTF-8?q?add=20=E5=88=B0=E8=B4=A6=E5=BC=80?= =?UTF-8?q?=E7=A5=A8-=E6=A0=87=E5=8D=8F=E9=A1=B9=E7=9B=AE-=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=20=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E5=B9=B6=E4=B8=94=E8=87=AA=E5=8A=A8=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=A8=8E=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPaymentCheckController.java | 7 +--- .../impl/PayPaymentCheckServiceImpl.java | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index 61cace99..48911421 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -102,12 +102,7 @@ public class PayPaymentCheckController extends JeroController check(@RequestBody PayPaymentRecord payPaymentRecord) { - try{ - payPaymentCheckService.check(payPaymentRecord); - }catch (Exception e){ - log.error("审核异常",e); - return Result.error(e.getMessage()); - } + payPaymentCheckService.check(payPaymentRecord); return Result.OK("操作成功"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 8adc73ee..7cf927b4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; /** @@ -553,6 +554,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl Date: Wed, 3 Aug 2022 16:36:02 +0800 Subject: [PATCH 27/28] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8E=A8=E9=80=81=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86=E7=A8=8E=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPaymentRecordServiceImpl.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index c051199f..76e72e88 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -632,7 +632,25 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl Date: Fri, 5 Aug 2022 14:09:52 +0800 Subject: [PATCH 28/28] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BC=96=E8=BE=91sql=20=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=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; + } + + } + }