From 5e712826347476fe524c960310f0aca12b247cbd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 14:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../basevehicle/BaseVehicleReturnQuery.java | 40 ++++++ .../api/basevehicle/BaseVehicleReturnVo.java | 30 ++++ .../biz/basevehicle/BaseVehicleMapper.java | 9 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 132 ++++++++++-------- .../base/biz/basevehicle/BaseVehicleRest.java | 13 ++ .../biz/basevehicle/BaseVehicleService.java | 77 +++++++++- 8 files changed, 249 insertions(+), 61 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 995a957715..62d1fe6cfb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -177,6 +177,10 @@ public interface BaseVehicleFeign { @PostMapping("/selExistingCarPageList") public ResultBean> selExistingCarPageList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("采购退库选择车辆分页列表") + @PostMapping("/vehicleReturnList") + ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 9bc5748720..40f86ec7de 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -99,6 +99,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java new file mode 100644 index 0000000000..d2c30c1030 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:30 + * @Description + */ +@Data +public class BaseVehicleReturnQuery implements Query { + private static final long serialVersionUID = 10773711417444473L; + + @ApiModelProperty(value = "品牌") + private String brandSid; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "快捷检索车型") + private String modelName; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java new file mode 100644 index 0000000000..7e1ea885cf --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:26 + * @Description 采购退库选择车辆数据对象 + */ +@Data +public class BaseVehicleReturnVo implements Vo { + private static final long serialVersionUID = -4203703835044248565L; + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String modelName; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "销售指导价") + private String guidedPrice; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 2f3a8d6c6a..241a20fcb8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -249,4 +249,13 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ IPage getNowModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage vehicleReturnPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 5dd2bb4036..723bcd3edd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -12,12 +12,12 @@ @@ -158,16 +158,16 @@ bvm.isValidity, bvm.isValidityValue FROM base_vehicle_model bvm - LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid - LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid - LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand + LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid + LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid + LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand WHERE bvm.sid = #{modelSid} - AND bmc.sid = #{modelConfigSid} + AND bmc.sid = #{modelConfigSid} INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location, - vehicleState, firstStartDate, libraryAge) + vehicleState, firstStartDate, libraryAge) VALUES (UUID(), @@ -196,8 +196,8 @@ - SELECT - bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue - FROM - base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid + SELECT bvm.sid AS modelSid, + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue + FROM base_vehicle bv + LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid ${ew.sqlSegment} @@ -355,8 +353,7 @@ @@ -462,8 +458,7 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 9a9c0793cc..2140affb58 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -290,6 +290,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv1); } + /** + * 采购退库选择车辆分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehicleReturnList(pagerQuery); + return rb.success().setData(pv); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 320e0b59b6..8a5404bd61 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2,11 +2,9 @@ package com.yxt.anrui.base.biz.basevehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; -import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; @@ -879,5 +877,80 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnList(PagerQuery pagerQuery) { + IPage page = vehicleReturnPageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehicleReturnPageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehicleReturnWrapper(pagerQuery.getParams()); + return baseMapper.vehicleReturnPageList(page, qw); + } + + private QueryWrapper vehicleReturnWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.like("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.like("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.eq("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + //锁定状态 + qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); + // 虚拟订单选择车辆查询现车库存列表参数 +// if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态 +// qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存")); +// } + } + return qw; + } } \ No newline at end of file