From 044e74e5caea631f78231fb9e8d44f3b2f086f9b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 16:38:44 +0800
Subject: [PATCH 1/4] 1

---
 .../anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index c8f6069570..8744a77d72 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -395,6 +395,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
                 scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
                 scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
+                scmCollectionRebateDto.setUploadDate("");
                 scmCollectionRebateDto.setManufaSaleChannel("");
                 scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
                 scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());

From 741b189ac80b73a5e195986e2d1589a422fdc497 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 16:45:45 +0800
Subject: [PATCH 2/4] 1

---
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java      | 1 -
 .../scm/api/scmcollectionrebate/ScmCollectionRebateVo.java     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 8744a77d72..c8f6069570 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -395,7 +395,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
                 scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
                 scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
-                scmCollectionRebateDto.setUploadDate("");
                 scmCollectionRebateDto.setManufaSaleChannel("");
                 scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
                 scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
index f72d1ad4a8..e2e3ecbc9f 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
@@ -107,8 +107,7 @@ public class ScmCollectionRebateVo implements Vo {
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("上传日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date uploadDate; // 上传日期
+    private String uploadDate; // 上传日期
     @ApiModelProperty("上传金额")
     private BigDecimal uploadMoney; // 上传金额
     @ApiModelProperty("调整金额")

From 617d35cbebc4e26d00ee927794bccaa1770d238a Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 16:52:37 +0800
Subject: [PATCH 3/4] 1

---
 .../scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
index 9341bbdfd2..8fd40d8b2a 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
@@ -59,6 +59,8 @@ public class ScmCollectionRebateQuery implements Query {
     private String brandName;
     @ApiModelProperty("回款方式key")
     private String collectionTypeKey;
+    @ApiModelProperty("厂家回款通路")
+    private String manufaSaleChannelValue;
     @ApiModelProperty("回款开始日期")
     private String collectionStartDate;
     @ApiModelProperty("回款结束日期")

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 4/4] 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()) {