Merge branch 'master-count-vehicle' into base-modify

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

@@ -72,6 +72,12 @@ public class VehicleCountRecord {
     )
     private Date countDate;
 
+    /**
+     * 无效数据数量（超过还车时间后还未出车的数据）
+     */
+    @Column(name = "no_use_num")
+    private Integer noUseNum;
+
     @Transient
     private String startTime;
 

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

@@ -279,6 +279,19 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             if(innerAfterArrivalNum != null && innerAfterArrivalNum > 0) {
                 innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
             }
+            //过期未出车无效数据
+            param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
+            List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
+            if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+                Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+                while (iterator.hasNext()) {
+                    if(iterator.next().getVehicleDepartureLogVo() != null) {
+                        iterator.remove();
+                    }
+                }
+                innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+            }
+
             innerCountRecord.setType(VehicleCountType.INNER.getCode());
             vehicleCountRecord.setCountDate(nowDate);
             tourCountRecord.setCountDate(nowDate);
@@ -337,6 +350,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
         param.put("bookUser", -2);
         //1代表正常出车，2代表提前出车，3代表延期出车
         param.put("type", 2);
+
         //租车提前出车数量
         Integer beforeDepartureNum = vehicleDepartureService.selectAllDepartureLog(param);
         if(beforeDepartureNum != null && beforeDepartureNum > 0) {
@@ -457,6 +471,19 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
         }
         innerCountRecord.setType(VehicleCountType.INNER.getCode());
+        //过期未出车无效数据
+        param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
+        List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
+        if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+            while (iterator.hasNext()) {
+                if(iterator.next().getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+            }
+            innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+        }
+
         vehicleCountRecord.setCountDate(nowDate);
         tourCountRecord.setCountDate(nowDate);
         innerCountRecord.setCountDate(nowDate);