From 9adb644bf4ac6e4af2818e466bdfd8c0cc3b6669 Mon Sep 17 00:00:00 2001 From: lijiarao <136157943@qq.com> Date: Mon, 16 Jan 2023 13:45:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=A8=E6=89=80=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20(=E7=B4=AF=E8=AE=A1)=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 9 ++++----- .../project/mapper/xml/PayWorkingGroupMapper.xml | 16 ++++++++-------- .../service/impl/PayWorkingGroupServiceImpl.java | 8 ++++---- 3 files changed, 16 insertions(+), 17 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 4a1a8a71..2a96c645 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 @@ -13,7 +13,6 @@ import com.jero.statistics.entity.*; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; /** @@ -221,7 +220,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { AllMoney queryAllMoney33(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); - List cumulativeListAllMoney(); + List cumulativeListAllMoney(@Param("paymentYear") String paymentYear); List amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode, @Param("type") Integer type); @@ -237,11 +236,11 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryListComeAllMoney(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); - List cumulativeListConfirmAmount(); + List cumulativeListConfirmAmount(@Param("paymentYear") String paymentYear); - List cumulativeListBillMoney(); + List cumulativeListBillMoney(@Param("paymentYear") String paymentYear); - List cumulativeListComeAllMoney(); + List cumulativeListComeAllMoney(@Param("paymentYear") String paymentYear); BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); 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 d9482a31..b1058aad 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 @@ -1976,12 +1976,12 @@ FROM (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate FROM pay_income_contract - WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(contract_date, '%Y-%m')) TMP1, (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate FROM pay_income_contract - WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(contract_date, '%Y-%m')) TMP2 WHERE TMP1.paymentDate >= TMP2.paymentDate GROUP BY TMP1.paymentDate @@ -1995,12 +1995,12 @@ FROM (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate FROM pay_confirm_payment_record - WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP1, (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate FROM pay_confirm_payment_record - WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP2 WHERE TMP1.paymentDate >= TMP2.paymentDate GROUP BY TMP1.paymentDate @@ -2014,12 +2014,12 @@ FROM (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate FROM pay_mail_bill - WHERE DATE_FORMAT(bill_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(bill_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(bill_date, '%Y-%m')) TMP1, (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate FROM pay_mail_bill - WHERE DATE_FORMAT(bill_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(bill_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(bill_date, '%Y-%m')) TMP2 WHERE TMP1.paymentDate >= TMP2.paymentDate GROUP BY TMP1.paymentDate @@ -2033,12 +2033,12 @@ FROM (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate FROM pay_payment_record - WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP1, (SELECT sum(no_tax_amount) AS allMoney, DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate FROM pay_payment_record - WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat('2022', '%') + WHERE DATE_FORMAT(payment_date, '%Y') LIKE concat(#{paymentYear}, '%') GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP2 WHERE TMP1.paymentDate >= TMP2.paymentDate GROUP BY TMP1.paymentDate 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 156e50c7..525f4684 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 @@ -600,10 +600,10 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl cumulativeListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch) { - List allMoneyList = payWorkingGroupMapper.cumulativeListAllMoney(); - List listConfirmAmount = payWorkingGroupMapper.cumulativeListConfirmAmount(); - List listBillMoney = payWorkingGroupMapper.cumulativeListBillMoney(); - List listComeAllMoney = payWorkingGroupMapper.cumulativeListComeAllMoney(); + List allMoneyList = payWorkingGroupMapper.cumulativeListAllMoney(allProjectStatisticsSearch.getPaymentYear()); + List listConfirmAmount = payWorkingGroupMapper.cumulativeListConfirmAmount(allProjectStatisticsSearch.getPaymentYear()); + List listBillMoney = payWorkingGroupMapper.cumulativeListBillMoney(allProjectStatisticsSearch.getPaymentYear()); + List listComeAllMoney = payWorkingGroupMapper.cumulativeListComeAllMoney(allProjectStatisticsSearch.getPaymentYear()); return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney); }