售后客户管理优化4

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;
 }

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("车牌号")

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());
             }

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);

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;
+
 }

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