From be8d7098dc88d7b9f8fc3f4933886aeda2434265 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 16:53:47 +0800
Subject: [PATCH] 1

---
 .../biz/scmcollectionrebate/ScmCollectionRebateService.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
index 94d7e209d7..c111c0bb54 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
@@ -141,6 +141,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
         }
+        if (StringUtils.isNotBlank(query.getManufaSaleChannelValue())) {
+            qw.eq("manufaSaleChannelValue", query.getManufaSaleChannelValue());
+        }
         if (StringUtils.isNotBlank(query.getRebateName())) {
             qw.like("rebateName", query.getRebateName());
         }
@@ -158,6 +161,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         qw.apply(StringUtils.isNotEmpty(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("createTime");
         IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmCollectionRebateVo record : pagging.getRecords()) {