1

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()) {