From ede5987dfc8d983d8c594d373ed307b12b6e0d6e Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 26 Oct 2023 16:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/excel/entity/DataCheckApplyMainInfo.java  | 4 ++--
 .../resources/mapper/tbs/TbsCostApplySumAmountMapper.xml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java b/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java
index eb542a76..60c85b09 100644
--- a/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java
+++ b/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java
@@ -44,12 +44,12 @@ public class DataCheckApplyMainInfo {
     private BigDecimal payAmt;
 
     /**
-     * 不再支付
+     * 待支付
      */
     private BigDecimal unPayAmt;
 
     /**
-     * 待支付
+     * 不再支付
      */
     private BigDecimal notPayAmt;
 
diff --git a/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml
index 69f5b811..14670715 100644
--- a/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml
+++ b/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml
@@ -113,8 +113,8 @@
         <result property="notCheckAmt"  column="not_check_amt"/>
         <result property="dontCheckAmt"  column="dont_check_amt"/>
         <result property="payAmt"  column="pay_amt"/>
-        <result property="unPayAmt"  column="not_pay_amt"/>
-        <result property="notPayAmt"  column="un_pay_amt"/>
+        <result property="unPayAmt"  column="un_pay_amt"/>
+        <result property="notPayAmt"  column="not_pay_amt"/>
     </resultMap>
 
     <select id="selectDataCheckApplyMainInfo"  resultMap="dataCheckApplyMainInfo">
@@ -124,7 +124,7 @@
         IFNULL(SUM(verification_totals.checking_amt), 0) AS checking_amt,
         IFNULL(SUM(activity_totals.dont_check_amt), 0) AS dont_check_amt,
         IFNULL(SUM(payment_totals.pay_amt), 0) AS pay_amt,
-        IFNULL(SUM(payment_totals.not_pay_amt), 0) AS un_pay_amt,
+        IFNULL(SUM(payment_totals.not_pay_amt), 0) AS not_pay_amt,
         IFNULL( SUM( activity_totals.cost_apply_amt) - SUM(verification_totals.checked_amt) - SUM(verification_totals.checking_amt) - SUM(activity_totals.dont_check_amt ), 0 ) AS not_check_amt,
         IFNULL( SUM( verification_totals.checked_amt) - SUM(payment_totals.pay_amt) - SUM(payment_totals.not_pay_amt ), 0 ) AS un_pay_amt
         FROM