Merge branch 'master-vehicle-count-bug' into dev

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

@@ -21,6 +21,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -124,16 +125,11 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 
 
 	public List<BranchCompanyVehicleCountVo> exportAllDate(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
-		if (StringUtils.isBlank(branchCompanyVehicleCountDTO.getStartTime()) || StringUtils.isBlank(branchCompanyVehicleCountDTO.getEndTime())) {
-			branchCompanyVehicleCountDTO.setStartTime(DateTime.now().minusDays(1).toString(DATE_TIME_FORMATTER));
-			branchCompanyVehicleCountDTO.setEndTime(DateTime.now().minusDays(1).toString(DATE_TIME_FORMATTER));
-		}
 		Integer type = branchCompanyVehicleCountDTO.getType() == null ? 1 : branchCompanyVehicleCountDTO.getType();
-		Query query = new Query(branchCompanyVehicleCountDTO);
-		Map<String, Object> param = query.getSuper();
-		param.remove("page");
-		param.remove("limit");
-		log.info("导出车辆统计信息：{}", param);
+		Map<String, Object> param = new HashMap<>();
+		if (branchCompanyVehicleCountDTO.getCompanyId() != null) {
+			param.put("companyId", branchCompanyVehicleCountDTO.getCompanyId());
+		}
 		if (type == 1) {//按天
 			return mapper.getAllCountInfo(param);
 		}