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

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

@@ -8,6 +8,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyVehicleCountMapper;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyVehicleCountDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Iterator;
@@ -16,7 +17,8 @@ import java.util.List;
 @Service
 @Slf4j
 public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCountMapper, BranchCompanyVehicleCount> {
-
+	@Autowired
+	VehicleInformationDownloadBiz vehicleInformationDownloadBiz;
 	public ObjectRestResponse add(List<BranchCompanyVehicleCount> branchCompanyVehicleCounts) {
 		if (branchCompanyVehicleCounts == null) {
 			return ObjectRestResponse.paramIsEmpty();
@@ -34,6 +36,7 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 	}
 
 	public ObjectRestResponse<PageDataVO<BranchCompanyVehicleCount>> findAll(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
+		vehicleInformationDownloadBiz.add();
 		Integer pageNo = branchCompanyVehicleCountDTO.getPage() == null ? 1 : branchCompanyVehicleCountDTO.getPage();
 		Integer pageSize = branchCompanyVehicleCountDTO.getLimit() == null ? 10 : branchCompanyVehicleCountDTO.getLimit();
 		branchCompanyVehicleCountDTO.setPage(pageNo);

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

@@ -103,7 +103,6 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
     }
 
     public List<BranchCompanyVehicleCountVo> getAllVehicleInfo() {
-        add();
         return vehicleBiz.getAllVehicleInfo();
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/VehicleInformationDownloadController.java

@@ -84,7 +84,6 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
         }
         List<BranchCompanyVehicleCount> rows = pageDataVO.getData();
         ExcelWriter writer = ExcelUtil.getWriter(true);
-        writer.merge(2,"导出车辆数据");
         writer.addHeaderAlias("countDate", "日期");
         writer.addHeaderAlias("companyName", "停靠分公司");
         writer.addHeaderAlias("vehicleNum", "车辆数量");