From 035e138eeec9501a659010a631da0bd76e6a082f Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 13 Feb 2025 11:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmSpecialRebateService.java              |  4 +++
 .../biz/scmvehrebate/ScmVehRebateService.java | 30 +++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index 4ace04ccc5..b7ca5d6a79 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -1631,6 +1631,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
         qw.eq("onceCheckState", 0);
+        qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                .or().isNull("uploadDate")
+        );
         qw.orderByDesc("createTime");
         List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
         for (OneExcelVo oneExcelVo : oneExcelVos) {
@@ -1700,6 +1703,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 );
         qw.ne("adjustmentState", 0);
         qw.eq("state", 2);
+        qw.ne("uploadDate", "");
         qw.isNotNull("uploadDate");
         qw.orderByDesc("createTime");
         List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);
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 55bb22f285..b4e30f984e 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
@@ -158,7 +158,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmVehRebateVo record : pagging.getRecords()) {
-            if ("001".equals(record.getCalculationModeKey())){
+            if ("001".equals(record.getCalculationModeKey())) {
                 record.setCalculationStandard(record.getCalculationStandard() + "%");
             }
         }
@@ -240,7 +240,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.orderByDesc("createTime");
         List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.listAll(qw);
         for (ScmVehRebateVo record : scmVehRebateVoList) {
-            if ("001".equals(record.getCalculationModeKey())){
+            if ("001".equals(record.getCalculationModeKey())) {
                 record.setCalculationStandard(record.getCalculationStandard() + "%");
             }
         }
@@ -524,6 +524,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
         qw.eq("onceCheckState", 0);
+        qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                .or().isNull("uploadDate")
+        );
         qw.orderByDesc("createTime");
         List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
         for (OneExcelVo oneExcelVo : oneExcelVos) {
@@ -602,6 +605,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 );
         qw.ne("adjustmentState", 0);
         qw.eq("state", 2);
+        qw.ne("uploadDate", "");
         qw.isNotNull("uploadDate");
         qw.orderByDesc("createTime");
         List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);
@@ -692,7 +696,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             scmVehRebate.setUseOrgName(sysOrganizationVo.getName());
             scmVehRebate.setOrgPath(dto.getOrgPath());
             scmVehRebate.setCreateBySid(dto.getCreateBySid());
-            if (!"2".equals(scmVehRebateVeh.getState())){
+            if (!"2".equals(scmVehRebateVeh.getState())) {
                 scmVehRebate.setState(0);
             }
             scmVehRebate.setPurchaseSystemSid(scmVehRebateVeh.getPurchaseSystemSid());
@@ -2185,29 +2189,29 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.orderByDesc("createTime");
         List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
         for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
-            if (scmVehRebateExcelVo.getState().equals("0")){
+            if (scmVehRebateExcelVo.getState().equals("0")) {
                 scmVehRebateExcelVo.setState("未预提");
-            }else if (scmVehRebateExcelVo.getState().equals("1")){
+            } else if (scmVehRebateExcelVo.getState().equals("1")) {
                 scmVehRebateExcelVo.setState("预提中");
-            }else if (scmVehRebateExcelVo.getState().equals("2")){
+            } else if (scmVehRebateExcelVo.getState().equals("2")) {
                 scmVehRebateExcelVo.setState("待核对");
-            }else if (scmVehRebateExcelVo.getState().equals("3")){
+            } else if (scmVehRebateExcelVo.getState().equals("3")) {
                 scmVehRebateExcelVo.setState("核对中");
-            }else if (scmVehRebateExcelVo.getState().equals("4")){
+            } else if (scmVehRebateExcelVo.getState().equals("4")) {
                 scmVehRebateExcelVo.setState("已核对");
             }
-            if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){
+            if (scmVehRebateExcelVo.getOnceCheckState().equals("0")) {
                 scmVehRebateExcelVo.setOnceCheckState("否");
-            }else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){
+            } else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")) {
                 scmVehRebateExcelVo.setOnceCheckState("是");
-            }else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){
+            } else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")) {
                 scmVehRebateExcelVo.setOnceCheckState("一次核对中");
             }
             scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
-            if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())){
+            if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())) {
                 scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
                 scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
-            }else {
+            } else {
                 scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
                 scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
             }