From 9a2206f6adeccb4b2c10af546c5e1f925659ee9d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 28 Oct 2024 15:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=964?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java   | 1 +
 .../anrui/as/api/asbusreservebill/AsBusreserveBillDto.java    | 1 +
 .../as/biz/asbusreservebill/AsBusreserveBillService.java      | 3 +++
 .../src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java   | 4 ++--
 .../main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java | 2 ++
 .../java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java  | 2 +-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java
index c20202584f..acec8f4fde 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java
@@ -100,4 +100,5 @@ public class AsBusreserveBill extends BaseEntity {
     private String subjectSid;
     @ApiModelProperty("科目")
     private String subject;
+    private String customerVehicleSid;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java
index a169fbcbb8..ac58b8b1ef 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java
@@ -79,6 +79,7 @@ public class AsBusreserveBillDto implements Dto {
     private String customerSid; // 客户sid
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
+    private String customerVehicleSid; // 客户名称
     @ApiModelProperty("联系电话")
     private String mobile; // 联系电话
     @ApiModelProperty("车牌号")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
index 95ba26591b..88995e33cf 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
@@ -407,6 +407,9 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             if (StringUtils.isNotBlank(bill.getVehModel())) {
                 billDto.setVehModel(bill.getVehModel());
             }
+            if (StringUtils.isNotBlank(bill.getCustomerVehicleSid())) {
+                billDto.setCustomerVehicleSid(bill.getCustomerVehicleSid());
+            }
             if (StringUtils.isNotBlank(bill.getCustomerOrg())) {
                 billDto.setCustomerOrg(bill.getCustomerOrg());
             }
diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java
index 57b883b2c1..3d9db106ec 100644
--- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java
+++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java
@@ -116,7 +116,7 @@ public class CrmCustomerRest {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isNotBlank(query.getVinNo())) {
             String vinNo = query.getVinNo();
-            if (vinNo.length() != 8 || vinNo.length() != 17) {
+            if (vinNo.length() != 8 && vinNo.length() != 17) {
                 return rb.setMsg("请填写8位或17位车架号！");
             }
         }
@@ -180,7 +180,7 @@ public class CrmCustomerRest {
      */
     @ApiOperation("售后客户管理分页列表")
     @PostMapping("/asListPage")
-    public ResultBean<PagerVo<AsCustomerListVo>> asListPage(PagerQuery<AsCustomerListQuery> pq) {
+    public ResultBean<PagerVo<AsCustomerListVo>> asListPage(@RequestBody PagerQuery<AsCustomerListQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<AsCustomerListVo> pv = crmCustomerService.asListPage(pq);
         return rb.success().setData(pv);
diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java
index a4164ce762..e44ae720f8 100644
--- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java
+++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java
@@ -171,4 +171,6 @@ public class CrmCustomerDto implements Dto {
     private String vehState;
     private String saleOrgName;
     private String saleDate;
+    private String sid;
+
 }
diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
index 0ff1addd01..60a7b3cf94 100644
--- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
+++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
@@ -618,7 +618,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
                         String customerSid = order.getCustomerSid();
                         CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
                         if (null != customerTemp) {
-                            BeanUtils.copyProperties(customerTemp,vo,"isDesignatedEnterprise","filingIndate");
+                            BeanUtils.copyProperties(customerTemp,vo,"isDesignatedEnterprise","filingIndate","sid");
                             vo.setVehState("0");
                             vo.setVinNo(vinNo);
                             vo.setSaleOrgName(order.getUseOrgName());