Merge branch 'dev' into 'master'

Dev-master-merge

See merge request !10

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/VehicleBiz.java

@@ -907,7 +907,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                    if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
                        if(!flag) { //解决重复执行的问题
                            Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-                           if (effected < 1) {
+                           if (effected < 0) {
                                return Boolean.FALSE;
                            }
                            flag = true;

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

@@ -71,7 +71,11 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             }
         }
         if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
-            predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour | endPredictableHour);
+            if(startPredictableHour == 0 || endPredictableHour == 0) {
+                predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour | endPredictableHour);
+            } else {
+                predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
+            }
         } else {
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);

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) {
@@ -204,13 +206,14 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     }
 
     public void removeStatus2(List<VehicleBookRecordVo> list) {
-        Iterator<VehicleBookRecordVo> iterator = list.iterator();
-        while (iterator.hasNext()) {
-            if (iterator.next().getVehicleDepartureLogVo() != null) {
-                iterator.remove();
+        if(list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
             }
         }
-
     }
 
     /**

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>