From bbd712727f2f51aa19cac379c0f893c4712bbbc5 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 25 Feb 2025 16:38:36 +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

---
 .../scm/biz/scmspecialrebate/ScmSpecialRebateService.java | 8 ++++----
 .../anrui/scm/biz/scmvehrebate/ScmVehRebateService.java   | 8 ++++----
 2 files changed, 8 insertions(+), 8 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 b8a72ef646..efb772dbc8 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
@@ -421,6 +421,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
+        qw.eq("state", 2);
+        qw.eq("adjustmentState", 0);
         if (StringUtils.isNotBlank(query.getCreateOrgName())) {
             qw.like("createOrgName", query.getCreateOrgName());
         }
@@ -492,8 +494,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("state", 2);
-        qw.eq("adjustmentState", 0);
         qw.orderByDesc("createTime");
         IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -551,6 +551,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
+        qw.eq("state", 2);
+        qw.eq("adjustmentState", 0);
         if (StringUtils.isNotBlank(query.getCreateOrgName())) {
             qw.like("createOrgName", query.getCreateOrgName());
         }
@@ -622,8 +624,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("state", 2);
-        qw.eq("adjustmentState", 0);
         qw.orderByDesc("createTime");
         List<ScmSpecialRebateVo> scmSpecialRebateVoList = baseMapper.checkApplyGetSpecialRebateAll(qw);
         for (ScmSpecialRebateVo record : scmSpecialRebateVoList) {
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 a5fd07f9e5..14794cb6a6 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
@@ -383,6 +383,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 return p;
             }
         }
+        qw.eq("state", 2);
+        qw.eq("adjustmentState", 0);
         if (StringUtils.isNotBlank(query.getBrandName())) {
             qw.like("brandName", query.getBrandName());
         }
@@ -457,8 +459,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("state", 2);
-        qw.eq("adjustmentState", 0);
         qw.orderByDesc("createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -516,6 +516,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 return p;
             }
         }
+        qw.eq("state", 2);
+        qw.eq("adjustmentState", 0);
         if (StringUtils.isNotBlank(query.getBrandName())) {
             qw.like("brandName", query.getBrandName());
         }
@@ -590,8 +592,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("state", 2);
-        qw.eq("adjustmentState", 0);
         qw.orderByDesc("createTime");
         List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.checkApplyGetVehRebateAll(qw);
         for (ScmVehRebateVo record : scmVehRebateVoList) {