选择驾驶员、车辆修改

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<CarCarVo> dto) {
+    public PageInfo<CarCarVo> getCarListBySup(EncryptedReq<CarCarVo> dto) {
-        return  service.getCarListBySup(dto.getData());
+        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+        List<CarCarVo> list = service.getCarListBySup(dto.getData());;
+        PageInfo<CarCarVo> pageInfo = new PageInfo<>(list);
+        return pageInfo;
     }
 
 

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<CarDriverVo> dto) {
+    public PageInfo<CarDriverVo> getDriverListBySup(EncryptedReq<CarDriverVo> dto) {
-         return   service.getDriverListBySup(dto.getData());
+        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+        List<CarDriverVo> list = service.getDriverListBySup(dto.getData());;
+        PageInfo<CarDriverVo> pageInfo = new PageInfo<>(list);
+        return pageInfo;
     }
 
     /**

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<CarCarVo> getCarListBySup(CarCarVo data);
 
     /**
      * 查询车辆附件

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<CarCarVo> getCarListBySup(CarCarVo data) {
         List<CarCarVo> list=new ArrayList<>();
         try {
             list=mapper.getCarListBySup(data);
         }catch (Exception e){
             log.error(e.toString());
         }
-        return ServerResponse.createSuccess(list);
+        return list;
     }
 
     @Override

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<CarDriverVo> getDriverListBySup(CarDriverVo data);
 
     /**
      * 查询驾驶员附件

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<CarDriverVo> getDriverListBySup(CarDriverVo data) {
         List<CarDriverVo> list=new ArrayList<>();
         try {
             list=mapper.getDriverListBySup(data);
         }catch (Exception e){
             log.error(e.toString());
         }
-        return ServerResponse.createSuccess(list);
+        return list;
     }
 
     @Override

src/main/resources/mappers/business/backstage/CarCarMapper.xml

@@ -84,5 +84,8 @@
         <if test="supId!=null and supId!=''">
             and  csi.sup_id=#{supId}
         </if>
+        <if test="carNum!=null and carNum!=''">
+            AND INSTR(csi.car_num,#{carNum}) > 0
+        </if>
     </select>
 </mapper>

src/main/resources/mappers/business/backstage/CarDriverMapper.xml

@@ -58,5 +58,8 @@
         <if test="supId!=null and supId!=''">
             and   cdi.sup_id=#{supId}
         </if>
+        <if test="name!=null and name!=''">
+            AND INSTR(cdi.name,#{name}) > 0
+        </if>
     </select>
 </mapper>