Merge branch 'master-vehicle-bg' into dev

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

@@ -45,12 +45,16 @@ public class BranchCompanyVehicleCountController extends BaseController<BranchCo
 			writer.addHeaderAlias("weekEndDate", "结束日期");
 			writer.addHeaderAlias("countDate", "日期");
 			writer.addHeaderAlias("vehicleNum", "数量");
+			writer.setColumnWidth(7, 17);
+			writer.setColumnWidth(5, 17);
+			writer.setColumnWidth(6, 17);
+			writer.setColumnWidth(1, 17);
 			// 一次性写出内容，使用默认样式，强制输出标题
 			writer.write(pageDataVO.getData(), true);
 			//response为HttpServletResponse对象
 			response.setContentType("application/vnd.ms-excel;charset=utf-8");
 			//test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
-			response.setHeader("Content-Disposition", "attachment;filename=clxx.xlsx");
+			response.setHeader("Content-Disposition", "attachment;filename=vehicleInfo.xlsx");
 			//out为OutputStream，需要写出到的目标流
 			ServletOutputStream out = response.getOutputStream();
 			writer.flush(out, true);

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

@@ -4,10 +4,8 @@
 
     <select id="getAllCountInfo" parameterType="Map" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
         SELECT
-        c.company_id,
-        c.count_date,
-        b.`name` AS companyName,
-        sum(c.vehicle_num) as vehicleNum
+        c.*,
+        b.`name` AS companyName
         FROM
         branch_company_vehicle_count c
         LEFT JOIN branch_company b ON b.id = c.company_id