Merge remote-tracking branch 'origin/dev' into dev

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

@@ -170,14 +170,20 @@ public class VehicleActiveService {
                 break;
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-        } else {
-            stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1 ) { //已经出车
+                    stringBuilder.append("中，使用人：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
+                    stringBuilder.append(" 使用人电话：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
+                    return stringBuilder.toString();
+                }
+            }
         }
+        stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         return stringBuilder.toString();
     }
 
@@ -314,7 +320,7 @@ public class VehicleActiveService {
                     Iterator<VehicleBookRecordVo> iterator = list.iterator();
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                        if(vehicleBookRecordVo.getVehicleDepartureLogVo() == null && (vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime()) < 0) {
+                        if(vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) {
                             iterator.remove();
                         }
                     }

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

@@ -380,7 +380,7 @@
 
     </select>
     <select id="selectByVehicleId" parameterType="java.lang.String"
-            resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+            resultMap="searchBookRecord">
        SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
                LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2