Skip to content

C
cloud-platform
Commit 80c94967 authored by jiaorz's avatar jiaorz
Browse files
Options

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

parents 483eac7d 592209a8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java
View file @ 80c94967
......@@ -196,7 +196,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
tourCountRecord.setActualArrivalNum(tourArrivalList.size());
}
//内部用车应还车数量
List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
......@@ -325,7 +325,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
tourCountRecord.setActualArrivalNum(tourArrivalList.size());
}
//内部用车应还车数量
List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment