LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 全所收入统计 (累计)查不到数据

Browse Source
This commit is contained in:
lijiarao
2023-01-16 13:45:04 +08:00
parent 53b97572d0
commit 9adb644bf4
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+4 -5
View File
@@ -13,7 +13,6 @@ import com.jero.statistics.entity.*;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@@ -221,7 +220,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
AllMoney queryAllMoney33(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); AllMoney queryAllMoney33(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
List<AllProjectStatistics> cumulativeListAllMoney(); List<AllProjectStatistics> cumulativeListAllMoney(@Param("paymentYear") String paymentYear);
List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode, @Param("type") Integer type); List<AmountClassDTO> 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<PayWorkingGroup> {
List<AllProjectStatistics> queryListComeAllMoney(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); List<AllProjectStatistics> queryListComeAllMoney(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
List<AllProjectStatistics> cumulativeListConfirmAmount(); List<AllProjectStatistics> cumulativeListConfirmAmount(@Param("paymentYear") String paymentYear);
List<AllProjectStatistics> cumulativeListBillMoney(); List<AllProjectStatistics> cumulativeListBillMoney(@Param("paymentYear") String paymentYear);
List<AllProjectStatistics> cumulativeListComeAllMoney(); List<AllProjectStatistics> cumulativeListComeAllMoney(@Param("paymentYear") String paymentYear);
BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+8 -8
View File
@@ -1976,12 +1976,12 @@
FROM (SELECT sum(no_tax_amount) AS allMoney, FROM (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate
FROM pay_income_contract 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, GROUP BY DATE_FORMAT(contract_date, '%Y-%m')) TMP1,
(SELECT sum(no_tax_amount) AS allMoney, (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate
FROM pay_income_contract 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 GROUP BY DATE_FORMAT(contract_date, '%Y-%m')) TMP2
WHERE TMP1.paymentDate >= TMP2.paymentDate WHERE TMP1.paymentDate >= TMP2.paymentDate
GROUP BY TMP1.paymentDate GROUP BY TMP1.paymentDate
@@ -1995,12 +1995,12 @@
FROM (SELECT sum(no_tax_amount) AS allMoney, FROM (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate
FROM pay_confirm_payment_record 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, GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP1,
(SELECT sum(no_tax_amount) AS allMoney, (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate
FROM pay_confirm_payment_record 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 GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP2
WHERE TMP1.paymentDate >= TMP2.paymentDate WHERE TMP1.paymentDate >= TMP2.paymentDate
GROUP BY TMP1.paymentDate GROUP BY TMP1.paymentDate
@@ -2014,12 +2014,12 @@
FROM (SELECT sum(no_tax_amount) AS allMoney, FROM (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate
FROM pay_mail_bill 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, GROUP BY DATE_FORMAT(bill_date, '%Y-%m')) TMP1,
(SELECT sum(no_tax_amount) AS allMoney, (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate DATE_FORMAT(bill_date, '%Y-%m') AS paymentDate
FROM pay_mail_bill 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 GROUP BY DATE_FORMAT(bill_date, '%Y-%m')) TMP2
WHERE TMP1.paymentDate >= TMP2.paymentDate WHERE TMP1.paymentDate >= TMP2.paymentDate
GROUP BY TMP1.paymentDate GROUP BY TMP1.paymentDate
@@ -2033,12 +2033,12 @@
FROM (SELECT sum(no_tax_amount) AS allMoney, FROM (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate
FROM pay_payment_record 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, GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP1,
(SELECT sum(no_tax_amount) AS allMoney, (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate DATE_FORMAT(payment_date, '%Y-%m') AS paymentDate
FROM pay_payment_record 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 GROUP BY DATE_FORMAT(payment_date, '%Y-%m')) TMP2
WHERE TMP1.paymentDate >= TMP2.paymentDate WHERE TMP1.paymentDate >= TMP2.paymentDate
GROUP BY TMP1.paymentDate GROUP BY TMP1.paymentDate
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+4 -4
View File
@@ -600,10 +600,10 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
@Override @Override
public List<AllProjectStatistics> cumulativeListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch) { public List<AllProjectStatistics> cumulativeListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch) {
List<AllProjectStatistics> allMoneyList = payWorkingGroupMapper.cumulativeListAllMoney(); List<AllProjectStatistics> allMoneyList = payWorkingGroupMapper.cumulativeListAllMoney(allProjectStatisticsSearch.getPaymentYear());
List<AllProjectStatistics> listConfirmAmount = payWorkingGroupMapper.cumulativeListConfirmAmount(); List<AllProjectStatistics> listConfirmAmount = payWorkingGroupMapper.cumulativeListConfirmAmount(allProjectStatisticsSearch.getPaymentYear());
List<AllProjectStatistics> listBillMoney = payWorkingGroupMapper.cumulativeListBillMoney(); List<AllProjectStatistics> listBillMoney = payWorkingGroupMapper.cumulativeListBillMoney(allProjectStatisticsSearch.getPaymentYear());
List<AllProjectStatistics> listComeAllMoney = payWorkingGroupMapper.cumulativeListComeAllMoney(); List<AllProjectStatistics> listComeAllMoney = payWorkingGroupMapper.cumulativeListComeAllMoney(allProjectStatisticsSearch.getPaymentYear());
return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney); return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney);
} }