aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS系统 - 统计报表 - 财务收款统计/销售回款率统计 - 超期收款金额(70%)无法查看收款明细bug修复

Browse Source
This commit is contained in:
aike 2026-01-12 17:17:50 +08:00
parent dc941ef22d
commit 6114b40029
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -353,8 +353,6 @@
when a.settle_type = '2'
and a.credit_period = 30
and a.settle_day = '1'
and b.trade_date <![CDATA[ >= ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH)
and b.trade_date <![CDATA[ < ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH)
and NOT EXISTS (
SELECT 1
FROM emis_settle_invoice_record f
@ -371,7 +369,12 @@
end
)
)
then case
when b.trade_date <![CDATA[ >= ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH)
and b.trade_date <![CDATA[ < ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH)
then ifnull(d.pay_money,0)
else 0
end
when a.settle_type='2'
and a.credit_period <![CDATA[ >= ]]> 30
and b.trade_date <![CDATA[ > ]]> a.payment_due_date
@ -1053,8 +1056,6 @@
when a.settle_type = '2'
and a.credit_period = 30
and a.settle_day = '1'
and b.trade_date <![CDATA[ >= ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH)
and b.trade_date <![CDATA[ < ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH)
and NOT EXISTS (
SELECT 1
FROM emis_settle_invoice_record f
@ -1071,7 +1072,12 @@
end
)
)
then case
when b.trade_date <![CDATA[ >= ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH)
and b.trade_date <![CDATA[ < ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH)
then ifnull(d.pay_money,0)
else 0
end
when a.settle_type='2'
and a.credit_period <![CDATA[ >= ]]> 30
and b.trade_date <![CDATA[ > ]]> a.payment_due_date