|
@@ -99,6 +99,11 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
|
|
|
if(record.getCarParkId() != null && map.keySet().contains(record.getCarParkId())){
|
|
|
record.setCarParkName(map.get(record.getCarParkId()));
|
|
|
}
|
|
|
+ if(record.getOutTime() != null){
|
|
|
+ record.setParkingTime(calculateTimeDifference(record.getInTime(),record.getOutTime()));
|
|
|
+ }else{
|
|
|
+ record.setParkingTime(calculateTimeDifference(record.getInTime(),new Date()));
|
|
|
+ }
|
|
|
barnRecords.add(record);
|
|
|
}
|
|
|
pageResult.setRecords(barnRecords);
|