修改违约逻辑

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

@@ -3,19 +3,14 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleCountType;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleCountRecord;
 import com.xxfc.platform.vehicle.mapper.VehicleCountRecordMapper;
-import com.xxfc.platform.vehicle.pojo.DepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.ExcelParamDto;
 import com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo;
 import com.xxfc.platform.vehicle.util.excel.ExcelExport;
@@ -24,18 +19,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 统计出车，交车数量
@@ -265,7 +256,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             //内部用车提前出车数量
             Integer innerBeforeArrivalNum = vehicleDepartureService.selectAllDepartureLog(param);
             if(innerBeforeArrivalNum != null && innerBeforeArrivalNum > 0) {
-                innerCountRecord.setAfterArrivalNum(innerBeforeArrivalNum);
+                innerCountRecord.setBeforeArrivalNum(innerBeforeArrivalNum);
             }
             param.put("type", 1);
             //内部用车正常出车数量