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
2022-11-18 11:11:53 +08:00
parent d267b7b35c
commit 06ddc8e84c
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+8 -14
View File
@@ -791,8 +791,7 @@
createTime, createTime,
CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
billMoney, billMoney,
confirmAmount, confirmAmount
confirmAmount1
from from
(select principalNameId as principalId, (select principalNameId as principalId,
principalName, principalName,
@@ -800,8 +799,7 @@
sum(paidNoTaxAmount) as comeAllMoney, sum(paidNoTaxAmount) as comeAllMoney,
createTime, createTime,
sum(invoiceNoTaxAmount) as billMoney, sum(invoiceNoTaxAmount) as billMoney,
sum(confirmNoTaxAmount) as confirmAmount, sum(confirmNoTaxAmount) as confirmAmount
sum(confirmAmount) as confirmAmount1
from from
<if test="principalPeopleSearch.paymentYear == null or principalPeopleSearch.paymentYear == ''"> <if test="principalPeopleSearch.paymentYear == null or principalPeopleSearch.paymentYear == ''">
v_statistical v v_statistical v
@@ -1286,18 +1284,16 @@
allMoney, allMoney,
comeAllMoney, comeAllMoney,
createTime, createTime,
CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
billMoney, billMoney,
confirmAmount, confirmAmount from
confirmAmount1 from
(select chargeCompanyId as chargeCompanyTemporaryId, (select chargeCompanyId as chargeCompanyTemporaryId,
chargeCompanyTemporaryName, chargeCompanyTemporaryName,
SUM(allMoney) as allMoney, SUM(allMoney) as allMoney,
sum(paidNoTaxAmount) as comeAllMoney, sum(paidNoTaxAmount) as comeAllMoney,
createTime, createTime,
sum(invoiceNoTaxAmount) as billMoney, sum(invoiceNoTaxAmount) as billMoney,
sum(confirmNoTaxAmount) as confirmAmount, sum(confirmNoTaxAmount) as confirmAmount
sum(confirmAmount) as confirmAmount1
from from
<if test="companyComeMoneySearch.paymentYear == null or companyComeMoneySearch.paymentYear == ''"> <if test="companyComeMoneySearch.paymentYear == null or companyComeMoneySearch.paymentYear == ''">
v_statistical v v_statistical v
@@ -1780,17 +1776,15 @@
comeAllMoney, comeAllMoney,
departName, departName,
billMoney, billMoney,
CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
confirmAmount, confirmAmount
confirmAmount1
from from
(select (select
sum(allMoney) as allMoney, sum(allMoney) as allMoney,
sum(paidNoTaxAmount) as comeAllMoney, sum(paidNoTaxAmount) as comeAllMoney,
depart as departName, depart as departName,
sum(invoiceNoTaxAmount) as billMoney, sum(invoiceNoTaxAmount) as billMoney,
sum(confirmNoTaxAmount) as confirmAmount, sum(confirmNoTaxAmount) as confirmAmount
sum(confirmAmount) as confirmAmount1
from from
<if test="departStatisticsSearch.paymentYear == null or departStatisticsSearch.paymentYear == ''"> <if test="departStatisticsSearch.paymentYear == null or departStatisticsSearch.paymentYear == ''">
v_statistical v v_statistical v