客户账单明细车架号模糊查询问题

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.Max;
 import java.util.List;
 
 /**
@@ -114,7 +115,7 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据车架号模糊查车辆信息")
     @PostMapping("/selectListByvinNo")
     @ResponseBody
-    ResultBean<String> selectListByvinNo(@RequestParam("vinNo") String vinNo);
+    ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
 
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -104,7 +104,7 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
     }
 
     @Override
-    public ResultBean<String> selectListByvinNo(String vinNo) {
+    public ResultBean<List<String>> selectListByvinNo(String vinNo) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -133,5 +133,5 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
      */
     List<String> selectByVinSidAndContractNo(@Param("list") List<String> vinSidList, @Param("contractNo") String contractId);
 
-    String selectListByvinNo(@Param("vinNo") String vinNo);
+    List<String> selectListByvinNo(@Param("vinNo") String vinNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -119,7 +119,7 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     }
 
     @Override
-    public ResultBean<String> selectListByvinNo(String vinNo) {
+    public ResultBean<List<String>> selectListByvinNo(String vinNo) {
         return busSalesOrderVehicleService.selectListByvinNo(vinNo);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -491,9 +491,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByVinSidAndContractNo(vinSidList,contractId);
     }
 
-    public ResultBean<String> selectListByvinNo(String vinNo) {
+    public ResultBean<List<String>> selectListByvinNo(String vinNo) {
         ResultBean rb = ResultBean.fireFail();
-      String sid = baseMapper.selectListByvinNo(vinNo);
-        return rb.success().setData(sid);
+      List<String> sids = baseMapper.selectListByvinNo(vinNo);
+        return rb.success().setData(sids);
     }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinUncollectedReceivablesDetailedQuery.java <br/>
@@ -48,9 +50,9 @@ import lombok.Data;
 @Data
 public class FinUncollectedReceivablesDetailedQuery implements Query {
 
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
 
     @ApiModelProperty("生成开始时间")
@@ -77,4 +79,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
     private String orgPath;
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;
+
+    private List<String> busVinSids;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -331,8 +331,17 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.eq("busVinSid", query.getVinNo());
+            if (!query.getBusVinSids().isEmpty()) {
+                List<String> busVinSids = query.getBusVinSids();
+                for (int i = 0; i < busVinSids.size(); i++) {
+                    qw.eq("busVinSid", busVinSids.get(i));
+                    if (i < busVinSids.size() - 1) {
+                        qw.or();
+                    }
+                }
+            }
         }
+
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.like("contractNo", query.getContractNo());
         }
@@ -358,8 +367,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
         //车架号查询
         if (StringUtils.isNotBlank(params.getVinNo())) {
-            String busVinSid = busSalesOrderVehicleFeign.selectListByvinNo(params.getVinNo()).getData();
-            params.setVinNo(busVinSid);
+            List<String> busVinSids = busSalesOrderVehicleFeign.selectListByvinNo(params.getVinNo()).getData();
+            params.setBusVinSids(busVinSids);
         }
         String orgPath = params.getOrgPath();
         String orgSidPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();