diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java index a9cb88b1..1aedccf2 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java @@ -63,8 +63,13 @@ public class CarMainServiceImpl extends ServiceImpl impl } } + //车俩品牌型号级联选择器返回值,第一位是品牌,第二位是型号 + List brandAndModel = createReqVO.getBrandAndModel(); // 插入 CarMain carMain = BeanUtils.toBean(createReqVO, CarMain.class); + carMain.setCarBrand(brandAndModel.get(0)); + carMain.setCarModel(brandAndModel.get(1)); + baseMapper.insert(carMain); // 返回 return CommonResult.success("新增成功"); @@ -88,9 +93,13 @@ public class CarMainServiceImpl extends ServiceImpl impl } } - // 更新 - CarMain updateObj = BeanUtils.toBean(updateReqVO, CarMain.class); - baseMapper.updateById(updateObj); + //车俩品牌型号级联选择器返回值,第一位是品牌,第二位是型号 + List brandAndModel = updateReqVO.getBrandAndModel(); + // 插入 + CarMain carMain = BeanUtils.toBean(updateReqVO, CarMain.class); + carMain.setCarBrand(brandAndModel.get(0)); + carMain.setCarModel(brandAndModel.get(1)); + baseMapper.updateById(carMain); return CommonResult.success("修改成功"); } @@ -120,8 +129,12 @@ public class CarMainServiceImpl extends ServiceImpl impl public CarMainRespVO getCarMain(String id) { //数据单查 CarMain carMain = baseMapper.selectById(id); - CarMainRespVO result = BeanUtils.toBean(carMain, CarMainRespVO.class); + List brandAndModel = new ArrayList<>(); + brandAndModel.add(carMain.getCarBrand()); + brandAndModel.add(carMain.getCarModel()); + CarMainRespVO result = BeanUtils.toBean(carMain, CarMainRespVO.class); + result.setBrandAndModel(brandAndModel); //联查客户信息 List cusList = customerCarMapper.selectCusListByCarId(id); result.setCusList(cusList); diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java index 571f067b..dba7d736 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java @@ -85,4 +85,6 @@ public class CarMainReqVO extends PageParam { @Schema(description = "车辆绑定标签信息") List labelList; + /**车辆品牌型号数组*/ + List brandAndModel; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java index 17a09474..eb533506 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java @@ -31,8 +31,15 @@ public class CarMainRespVO extends CarMain { @Schema(description = "标签信息") List labelList; + /**品牌字符*/ + String brandStr; + /**型号字符*/ + String modelStr; + /**车辆品牌型号数组*/ + List brandAndModel; + diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java index 90df7a00..c4659974 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java @@ -27,6 +27,9 @@ public class CustomerMainRespVO extends CustomerMain { /**标签信息*/ List labelList; + /**车辆品牌型号数组*/ + List brandAndModel; + /**是否车主(0否1是)*/ private String isOwner; diff --git a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml index f9fd3c5a..9b478754 100644 --- a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml +++ b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml @@ -34,8 +34,10 @@