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 6fc29e38..40b054e4 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 @@ -791,8 +791,7 @@ createTime, CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, billMoney, - confirmAmount, - confirmAmount1 + confirmAmount from (select principalNameId as principalId, principalName, @@ -800,8 +799,7 @@ sum(paidNoTaxAmount) as comeAllMoney, createTime, sum(invoiceNoTaxAmount) as billMoney, - sum(confirmNoTaxAmount) as confirmAmount, - sum(confirmAmount) as confirmAmount1 + sum(confirmNoTaxAmount) as confirmAmount from v_statistical v @@ -1286,18 +1284,16 @@ allMoney, comeAllMoney, createTime, - CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, + CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, billMoney, - confirmAmount, - confirmAmount1 from + confirmAmount from (select chargeCompanyId as chargeCompanyTemporaryId, chargeCompanyTemporaryName, SUM(allMoney) as allMoney, sum(paidNoTaxAmount) as comeAllMoney, createTime, sum(invoiceNoTaxAmount) as billMoney, - sum(confirmNoTaxAmount) as confirmAmount, - sum(confirmAmount) as confirmAmount1 + sum(confirmNoTaxAmount) as confirmAmount from v_statistical v @@ -1780,17 +1776,15 @@ comeAllMoney, departName, billMoney, - CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, - confirmAmount, - confirmAmount1 + CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, + confirmAmount from (select sum(allMoney) as allMoney, sum(paidNoTaxAmount) as comeAllMoney, depart as departName, sum(invoiceNoTaxAmount) as billMoney, - sum(confirmNoTaxAmount) as confirmAmount, - sum(confirmAmount) as confirmAmount1 + sum(confirmNoTaxAmount) as confirmAmount from v_statistical v