出国记录添加出车分公司查询

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java

@@ -32,17 +32,17 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate,code, time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,time));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate, time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,time, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -14,9 +14,18 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
     List<VehicleDepartureLog> selectByVehicle(String vehicleId);
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,@Param("code") Integer code, @Param("time") String time);
-
-    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,
+                                            @Param("code") Integer code,
+                                            @Param("zoneId") Integer zoneId,
+                                            @Param("departureId") Integer departureId,
+                                            @Param("time") String time);
+
+    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
+                                                      @Param("code") Integer code,
+                                                      @Param("zoneId") Integer zoneId,
+                                                      @Param("departureId") Integer departureId,
+                                                      @Param("time") String time,
+                                                      @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

@@ -33,8 +33,22 @@ public class VehicleDepartureController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    /**
+     * @param numberPlate 车牌
+     * @param code        车辆编码
+     * @param time
+     * @param departureId 出发分公司id
+     * @param page
+     * @param limit
+     * @param request
+     * @return
+     */
     @GetMapping("page")
-    public RestResponse page(String numberPlate,@RequestParam(value = "code",required = false) Integer code,String time, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate,
+                             @RequestParam(value = "code", required = false) Integer code, String time,
+                             @RequestParam(value = "zoneId",required = false) Integer zoneId,
+                             @RequestParam(value = "departureId", required = false) Integer departureId,
+                             Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -43,15 +57,15 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, time, page, limit));
     }
 
     @GetMapping("small/page")
     @IgnoreUserToken
-    public RestResponse pageBySmall(String numberPlate,@RequestParam(value = "code",required = false) Integer code, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
+    public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String time, Integer page, Integer limit, Integer uid, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -60,14 +74,15 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code,time,page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, time, page, limit));
     }
 
     /**
      * 根据车辆id查询并分页
+     *
      * @param vehicleId
      * @param page
      * @param limit
@@ -97,39 +112,40 @@ public class VehicleDepartureController {
 
     /**
      * 保存
+     *
      * @param vehicleDepartureLog
      * @return
      */
     @PostMapping("/app/save")
-    public ObjectRestResponse save(@RequestBody VehicleDepartureLog vehicleDepartureLog){
+    public ObjectRestResponse save(@RequestBody VehicleDepartureLog vehicleDepartureLog) {
         return vehicleDepartureService.save(vehicleDepartureLog);
     }
 
 
     /**
      * 查询一条
+     *
      * @param vid 车辆id
      * @return
      * @throws Exception
      */
     @GetMapping("/app/findOne/{id}")
-    public  ObjectRestResponse findOne(@PathVariable Integer vid) throws Exception {
-       return vehicleDepartureService.findOne(vid);
+    public ObjectRestResponse findOne(@PathVariable Integer vid) throws Exception {
+        return vehicleDepartureService.findOne(vid);
     }
 
 
     /**
-     *
      * 收车
+     *
      * @param vdl
      * @return
      * @throws Exception
      */
     @PutMapping("/app/collect")
-    public  ObjectRestResponse collect(@RequestBody VehicleDepartureLog vdl) throws Exception {
+    public ObjectRestResponse collect(@RequestBody VehicleDepartureLog vdl) throws Exception {
         return vehicleDepartureService.collect(vdl);
     }
 
 
-
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -64,6 +64,12 @@
             <if test="code!=null">
                and  vehicle.code=#{code}
             </if>
+            <if test="zoneId!=null">
+             and  bc.zone_id=#{zoneId}
+            </if>
+            <if test="departureId!=null">
+              and  vehicle_departure_log.departure_branch_company_id=#{departureId}
+            </if>
         </trim>
         order by create_time desc
     </select>
@@ -112,6 +118,15 @@
                 or vehicle_departure_log.departure_time is null
                 )
             </if>
+            <if test="code!=null">
+                and  vehicle.code=#{code}
+            </if>
+            <if test="zoneId!=null">
+              and  bc.zone_id=#{zoneId}
+            </if>
+            <if test="departureId!=null">
+                and  vehicle_departure_log.departure_branch_company_id=#{departureId}
+            </if>
         </trim>
         order by create_time desc
     </select>