Merge branch 'master-background-manager' into dev

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -134,6 +134,7 @@ public class VehicleModel implements Serializable {
 	private Integer hotSign;
 
 	@ApiModelProperty(value = "是否删除")
+	@Column(name = "isdel")
 	private  Integer isdel;
 	@Column(name = "rent_discount_status")
 	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -49,6 +49,11 @@ public class VehiclePageQueryVo {
      * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
      */
     private Integer useType;
+
+    /**
+     * 托管人
+     */
+    private String belongToName;
     /**
      * 预定目标日期(开始)
      */

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

@@ -1491,6 +1491,29 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return count > 0;
     }
 
+    public Boolean checkVinExist(String vin, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("vin", vin);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
+
+    public Boolean checkEngineNumExist(String engineNum, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("engineNum", engineNum);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
 
     public List<String> findbyPlateNumberAndVehicleCod(String plateNumber,String vehicleCode) {
         List<String> vehicleIds = Lists.newArrayList();

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

@@ -34,17 +34,17 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,startTime, endTime));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime,  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,code,zoneId,departureId,time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,startTime, endTime, 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

@@ -20,13 +20,16 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
                                             @Param("code") Integer code,
                                             @Param("zoneId") Integer zoneId,
                                             @Param("departureId") Integer departureId,
-                                            @Param("time") String time);
+                                            @Param("startTime") String startTime,
+                                            @Param("endTime") String endTime
+                                            );
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
                                                       @Param("code") Integer code,
                                                       @Param("zoneId") Integer zoneId,
                                                       @Param("departureId") Integer departureId,
-                                                      @Param("time") String time,
+                                                      @Param("startTime") String startTime,
+                                                      @Param("endTime") String endTime,
                                                       @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);

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

@@ -561,6 +561,17 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(exist);
     }
 
+    @GetMapping("/exist_vin/{vin}")
+    public ObjectRestResponse<Boolean> checkVinExist(@PathVariable(value = "vin") String vin,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkVinExist(vin,id);
+        return ObjectRestResponse.succ(exist);
+    }
+
+    @GetMapping("/exist_engineNum/{engineNum}")
+    public ObjectRestResponse<Boolean> checkEngineNumExist(@PathVariable(value = "engineNum") String engineNum,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkEngineNumExist(engineNum,id);
+        return ObjectRestResponse.succ(exist);
+    }
 
     @GetMapping("/findVehicleIds")
    public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){

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

@@ -36,7 +36,7 @@ public class VehicleDepartureController {
     /**
      * @param numberPlate 车牌
      * @param code        车辆编码
-     * @param time
+     * @param
      * @param departureId 出发分公司id
      * @param page
      * @param limit
@@ -45,7 +45,7 @@ public class VehicleDepartureController {
      */
     @GetMapping("page")
     public RestResponse page(String numberPlate,
-                             @RequestParam(value = "code", required = false) Integer code, String time,
+                             @RequestParam(value = "code", required = false) Integer code, String startTime, String endTime,
                              @RequestParam(value = "zoneId",required = false) Integer zoneId,
                              @RequestParam(value = "departureId", required = false) Integer departureId,
                              Integer page, Integer limit, HttpServletRequest request) {
@@ -57,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, code, zoneId,departureId, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, startTime, endTime, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, startTime, endTime, 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 startTime, String endTime,Integer page, Integer limit, Integer uid, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -74,10 +74,10 @@ 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, code, null,null, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, startTime,endTime, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, startTime,endTime, page, limit));
     }
 
     /**

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

@@ -472,7 +472,7 @@
                 CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
-                and v3.number_plate = #{numberPlate}
+                and v3.number_plate like concat('%', #{numberPlate}, '%')
             </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}

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

@@ -100,18 +100,12 @@
             <if test="numberPlate != null and numberPlate != ''">
                 and vehicle.number_plate = #{numberPlate}
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.departure_time is null
-                )
-
+                vehicle_departure_log.departure_time &gt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time &gt;=  str_to_date(#{endTime}, '%Y-%m-%d %H')
             </if>
             <if test="code!=null">
                and  vehicle.code=#{code}
@@ -158,17 +152,17 @@
                 )
                 )
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time  &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                vehicle_departure_log.departure_time &lt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{startTime}, '%Y-%m-%d %H'))
                 or vehicle_departure_log.departure_time is null
-                )
+
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time >=  str_to_date(#{endTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{endTime}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.arrival_time is null
             </if>
             <if test="code!=null">
                 and  vehicle.code=#{code}

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

@@ -88,6 +88,8 @@
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -114,6 +116,9 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
+        <if test="belongToName !=null">
+            and v.belong_to_name = #{belongToName}
+        </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
@@ -123,9 +128,15 @@
         <if test="code !=null">
             and v.code = #{code}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status != 6 and status != 7">
             and v.status = #{status}
         </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
+        </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')
         </if>
@@ -266,6 +277,9 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
+        <if test="belongToName !=null">
+            and v.belong_to_name = #{belongToName}
+        </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>