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

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompanyVehicleCount.java

@@ -34,10 +34,5 @@ public class BranchCompanyVehicleCount {
     @Column(name = "count_date")
     private Date countDate;
 
-    /**
-     * 公司ID
-     */
-    @Column(name = "company_id")
-    private Integer companyId;
 
 }
\ No newline at end of file

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

@@ -114,7 +114,6 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
         branchCompanyVehicleCountVos.parallelStream().forEach(result->{
             try {
                 BranchCompanyVehicleCount branchCompanyVehicleCount = new BranchCompanyVehicleCount();
-                branchCompanyVehicleCount.setCompanyId(result.getCompanyId());
                 branchCompanyVehicleCount.setCompanyName(result.getParkBranchCompanyName());
                 branchCompanyVehicleCount.setVehicleNum(result.getCount());
                 DateTime dateTime = DateTime.now();

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

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

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -589,8 +589,7 @@
     <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
         SELECT
         b1. NAME AS parkBranchCompanyName,
-        count(v1.id) as count,
-        b1.id as companyId
+        count(v1.id) as count
         FROM
         branch_company b1
         LEFT JOIN vehicle v1 ON v1.park_branch_company_id = b1.id