核銷bug

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

@@ -288,7 +288,7 @@ public class VehicleActiveService {
                 Map<String, Object> param = new HashMap<>();
                 param.put("vehicleId", vehicleBookRecord.getVehicleId());
                 param.put("bookedEndDate", vehicleBookRecord.getBookStartDate());
-                List<VehicleBookRecord> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
+                List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
                 if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());

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

@@ -87,8 +87,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         insertSelectiveRe(vehicleBookRecord);
     }
 
-    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param) {
-        return mapper.selectByVehicleIdAndTime(param);
+    public List<VehicleBookRecordVo> selectByVehicleIdAndTime(Map<String, Object> param) {
+        List<VehicleBookRecordVo> list = mapper.selectByVehicleIdAndTime(param);
+        removeStatus2(list);
+        return list;
     }
 
     public int changeRecordStatus(Map<String, Object> updateParam) {

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

@@ -36,5 +36,5 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
 
     public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
 
-    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param);
+    public List<VehicleBookRecordVo> selectByVehicleIdAndTime(Map<String, Object> param);
 }
\ No newline at end of file

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

@@ -325,7 +325,7 @@
         order by vbr.id desc
     </select>
 
-    <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
+    <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
          where v1.vehicle_id = #{vehicleId}   and v1.book_end_date &lt;= #{bookedEndDate} and v1.status BETWEEN 1 and 2
     </select>