diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java index f9b9222..2488495 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarCarController.java @@ -122,10 +122,13 @@ public class CarCarController { * @param dto * @return */ - @PostMapping("getCarListBySup") + @GetMapping("getCarListBySup") @DecryptAndVerify(decryptedClass = CarCarVo.class) - public ServerResponse getCarListBySup(EncryptedReq dto) { - return service.getCarListBySup(dto.getData()); + public PageInfo getCarListBySup(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + List list = service.getCarListBySup(dto.getData());; + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java index f8bfe42..4a3d984 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarDriverController.java @@ -121,10 +121,13 @@ public class CarDriverController { * 传入supId * @return */ - @PostMapping("getDriverListBySup") + @GetMapping("getDriverListBySup") @DecryptAndVerify(decryptedClass = CarDriverVo.class) - public ServerResponse getDriverListBySup(EncryptedReq dto) { - return service.getDriverListBySup(dto.getData()); + public PageInfo getDriverListBySup(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + List list = service.getDriverListBySup(dto.getData());; + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; } /** diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarService.java index 1da4d21..78d2746 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarService.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarService.java @@ -48,7 +48,7 @@ public interface CarCarService { * @param data * @return */ - ServerResponse getCarListBySup(CarCarVo data); + List getCarListBySup(CarCarVo data); /** * 查询车辆附件 diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java index 0dd6508..043130f 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarCarServiceImpl.java @@ -330,14 +330,14 @@ public class CarCarServiceImpl implements CarCarService { * @return */ @Override - public ServerResponse getCarListBySup(CarCarVo data) { + public List getCarListBySup(CarCarVo data) { List list=new ArrayList<>(); try { list=mapper.getCarListBySup(data); }catch (Exception e){ log.error(e.toString()); } - return ServerResponse.createSuccess(list); + return list; } @Override diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverService.java index d156617..447abff 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverService.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverService.java @@ -54,7 +54,7 @@ public interface CarDriverService { * @param data * @return */ - ServerResponse getDriverListBySup(CarDriverVo data); + List getDriverListBySup(CarDriverVo data); /** * 查询驾驶员附件 diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverServiceImpl.java index a5e197d..0094973 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverServiceImpl.java @@ -330,14 +330,14 @@ public class CarDriverServiceImpl implements CarDriverService{ * @return */ @Override - public ServerResponse getDriverListBySup(CarDriverVo data) { + public List getDriverListBySup(CarDriverVo data) { List list=new ArrayList<>(); try { list=mapper.getDriverListBySup(data); }catch (Exception e){ log.error(e.toString()); } - return ServerResponse.createSuccess(list); + return list; } @Override diff --git a/src/main/resources/mappers/business/backstage/CarCarMapper.xml b/src/main/resources/mappers/business/backstage/CarCarMapper.xml index 84a814b..d75f09f 100644 --- a/src/main/resources/mappers/business/backstage/CarCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarCarMapper.xml @@ -84,5 +84,8 @@ and csi.sup_id=#{supId} + + AND INSTR(csi.car_num,#{carNum}) > 0 + \ No newline at end of file diff --git a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml index a86e009..648d704 100644 --- a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml @@ -58,5 +58,8 @@ and cdi.sup_id=#{supId} + + AND INSTR(cdi.name,#{name}) > 0 + \ No newline at end of file