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 10459dd..b6a9147 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 @@ -47,10 +47,25 @@ public class CarDriverController { @DecryptAndVerify(decryptedClass = CarDriverVo.class) public PageInfo getDriverList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - List list = service.getDriverPageList(dto.getData());; + List list = service.getDriverPageList(dto.getData()); PageInfo pageInfo = new PageInfo<>(list); return pageInfo; } + + /** + * 分页查询类型数据接口--查询白名单 + * @param dto + * @return + */ + @GetMapping("getDriverPageWhiteList") + @DecryptAndVerify(decryptedClass = CarDriverVo.class) + public PageInfo getDriverPageWhiteList(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + List list = service.getDriverPageWhiteList(dto.getData());; + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; + } + /** * 导出需求计划 * @param @@ -76,6 +91,31 @@ public class CarDriverController { log.error(e.toString(), e); } } + + /** + * 导出--驾驶员白名单 + * @param + */ + @PostMapping("exportWhiteList") + public void exportWhiteList(HttpServletResponse response, @RequestBody CarDriverVo dto) { + try { + List list = service.getDriverPageWhiteList(dto); + final int[] num = {1}; + list.forEach(vo->{ + if (vo.getIsWhiteList()==1){ + vo.setIsWhiteStr("是"); + } else { + vo.setIsWhiteStr("否"); + } + vo.setXh(num[0]); + num[0]++; + }); + ExportExcelUtil.export(response,"驾驶员", CarDriverVo.class,list); + } catch (Exception e) { + log.error(e.toString(), e); + } + } + /** * 新增车辆信息 * @param diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarDriverMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarDriverMapper.java index cb669ba..a66f8a6 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarDriverMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarDriverMapper.java @@ -17,6 +17,13 @@ public interface CarDriverMapper { */ List getDriverPageList(CarDriverVo data); + /** + * 驾驶员白名单列表查询 + * @param data + * @return + */ + List getDriverPageWhiteList(CarDriverVo data); + /** * 新增驾驶人员 * @param driverVo @@ -51,4 +58,5 @@ public interface CarDriverMapper { * @return */ List getDriverListBySup(CarDriverVo data); + } 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 447abff..75e398c 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 @@ -19,6 +19,13 @@ public interface CarDriverService { */ List getDriverPageList(CarDriverVo data); + /** + * 获取驾驶员白名单列表 + * @param data + * @return + */ + List getDriverPageWhiteList(CarDriverVo data); + /** * 新增人员信息 * @param request @@ -62,4 +69,5 @@ public interface CarDriverService { * @return */ ServerResponse getDriverImageList(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 d2768b2..7c690a3 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 @@ -55,6 +55,17 @@ public class CarDriverServiceImpl implements CarDriverService{ return new ArrayList<>(); } + @Override + public List getDriverPageWhiteList(CarDriverVo data) { + try{ + return mapper.getDriverPageWhiteList(data); + }catch (Exception e){ + log.error(e.toString(),e); + } + + return new ArrayList<>(); + } + /** * 新增驾驶员细腻些 * @param request diff --git a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml index 7027af3..b830813 100644 --- a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml @@ -17,33 +17,62 @@ where id=#{id} - + select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,file1.num sfzNum,file2.num jszNum,file3.num + otherNum,cs.name supName,cdi.is_white as isWhiteList + from car_driver_info cdi + left join car_supplier cs on cs.id=cdi.sup_id + left join( + SELECT count(1) num ,own_id id,type from bm_file_upload + where model_table='car_driver_info' AND type in(2,3) + GROUP BY own_id + )file1 on file1.id=cdi.id + left join( + SELECT count(1) num ,own_id id,type from bm_file_upload + where model_table='car_driver_info' AND type in(4,5) + GROUP BY own_id + )file2 on file2.id=cdi.id + left join( + SELECT count(1) num ,own_id id,type from bm_file_upload + where model_table='car_driver_info' AND type=6 + GROUP BY own_id + )file3 on file3.id=cdi.id + where cdi.is_active=1 + + and cdi.name like concat('%',#{name},'%') + + + and cs.name like concat('%',#{supName},'%') + + ORDER BY cdi.create_time desc + + \ No newline at end of file