From 06ddc8e84c01ba5bc58b4ce53017c7e994bf8e15 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 18 Nov 2022 11:11:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A1=AE=E6=94=B6=E7=8E=87=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

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
         <if test="principalPeopleSearch.paymentYear == null or principalPeopleSearch.paymentYear == ''">
             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
         <if test="companyComeMoneySearch.paymentYear == null or companyComeMoneySearch.paymentYear == ''">
             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
         <if test="departStatisticsSearch.paymentYear == null or departStatisticsSearch.paymentYear == ''">
             v_statistical v