From 98925e7eb89b4032ba4293a0a5526a12921a0e54 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Wed, 30 Apr 2025 16:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loanoverduefin/LoanOverdueFinService.java |  1 -
 .../biz/scmvehrebate/ScmVehRebateMapper.xml   | 36 ++++++++++++++++++-
 .../biz/scmvehrebate/ScmVehRebateService.java | 21 -----------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java
index 9e35d5f999..a9d6e83946 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java
@@ -772,7 +772,6 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                         NullPointerException nullPointerException = new NullPointerException();
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
-                    temp = temp.replace(".0", "");
                     for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
index 2f6ac393fc..e5532e7491 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
@@ -66,7 +66,41 @@
 
     <select id="excelList" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo">
         SELECT
-        *,
+        purchaseSystemName,
+        vinNo,
+        vehModelName,
+        palceGenDate,
+        rebateTypeValue,
+        rebateName,
+        estimateRebate,
+        uploadMoney,
+        secondaryUploadMoney,
+        stayDetermineMoney,
+        adjustmentMoney,
+        date_format(createTime, '%Y-%m-%d') as createTime,
+        withholdingDate,
+        uploadDate,
+        secondaryUploadDate,
+        case state
+        WHEN '0' THEN '未预提'
+        WHEN '1' THEN '预提中'
+        WHEN '2' THEN '待核对'
+        WHEN '3' THEN '核对中'
+        WHEN '4' THEN '已核对'
+        end as state,
+        case onceCheckState
+        WHEN '0' THEN '否'
+        WHEN '1' THEN '是'
+        WHEN '2' THEN '一次核对中'
+        end as onceCheckState,
+        manufactorSettlementPrice,
+        freight,
+        topAmount,
+        calculationModeValue,
+        calculationStandard,
+        remarks,
+        brandName,
+        createOrgName,
         expectTreatCost + expectSuppCost AS withholdCost,
         onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money,
         estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney,
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 54f31de90d..e13b919fb3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -2536,27 +2536,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 );
         qw.orderByDesc("createTime");
         List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
-        for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
-            if (scmVehRebateExcelVo.getState().equals("0")) {
-                scmVehRebateExcelVo.setState("未预提");
-            } else if (scmVehRebateExcelVo.getState().equals("1")) {
-                scmVehRebateExcelVo.setState("预提中");
-            } else if (scmVehRebateExcelVo.getState().equals("2")) {
-                scmVehRebateExcelVo.setState("待核对");
-            } else if (scmVehRebateExcelVo.getState().equals("3")) {
-                scmVehRebateExcelVo.setState("核对中");
-            } else if (scmVehRebateExcelVo.getState().equals("4")) {
-                scmVehRebateExcelVo.setState("已核对");
-            }
-            if (scmVehRebateExcelVo.getOnceCheckState().equals("0")) {
-                scmVehRebateExcelVo.setOnceCheckState("否");
-            } else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")) {
-                scmVehRebateExcelVo.setOnceCheckState("是");
-            } else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")) {
-                scmVehRebateExcelVo.setOnceCheckState("一次核对中");
-            }
-            scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
-        }
         return scmVehRebateExcelVos;
     }
 }
\ No newline at end of file