From 4fd5b2ad7e5ea2ab3d0d35ff127d91040c7aa768 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 8 Jun 2023 08:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=BD=A6=E6=9E=B6=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicleFeign.java | 3 ++- .../BusSalesOrderVehicleFeignFallback.java | 2 +- .../BusSalesOrderVehicleMapper.java | 2 +- .../BusSalesOrderVehicleRest.java | 2 +- .../BusSalesOrderVehicleService.java | 6 +++--- .../FinUncollectedReceivablesDetailedQuery.java | 8 ++++++-- .../FinUncollectedReceivablesDetailedService.java | 15 ++++++++++++--- 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index dab7cf3507..8ebceb0355 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/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 selectListByvinNo(@RequestParam("vinNo") String vinNo); + ResultBean> selectListByvinNo(@RequestParam("vinNo") String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 27d166bf1e..a9b7f611d1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/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 selectListByvinNo(String vinNo) { + public ResultBean> selectListByvinNo(String vinNo) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 6f9f9e4f1e..8faf3f54f3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/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 selectByVinSidAndContractNo(@Param("list") List vinSidList, @Param("contractNo") String contractId); - String selectListByvinNo(@Param("vinNo") String vinNo); + List selectListByvinNo(@Param("vinNo") String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 4d386c425b..2c844589e6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/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 selectListByvinNo(String vinNo) { + public ResultBean> selectListByvinNo(String vinNo) { return busSalesOrderVehicleService.selectListByvinNo(vinNo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index e75c3424bf..8e8754b2b4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/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 selectListByvinNo(String vinNo) { + public ResultBean> selectListByvinNo(String vinNo) { ResultBean rb = ResultBean.fireFail(); - String sid = baseMapper.selectListByvinNo(vinNo); - return rb.success().setData(sid); + List sids = baseMapper.selectListByvinNo(vinNo); + return rb.success().setData(sids); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 9a1e2cdd55..b5ae52e025 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/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(销售相关)
* File: FinUncollectedReceivablesDetailedQuery.java
@@ -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 busVinSids; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 85f256d19b..94bb3725a7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/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 qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getVinNo())) { - qw.eq("busVinSid", query.getVinNo()); + if (!query.getBusVinSids().isEmpty()) { + List 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 busVinSids = busSalesOrderVehicleFeign.selectListByvinNo(params.getVinNo()).getData(); + params.setBusVinSids(busVinSids); } String orgPath = params.getOrgPath(); String orgSidPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();