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

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

 package com.xxfc.platform.vehicle.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Id;
@@ -32,6 +34,10 @@ public class BranchCompanyVehicleCount {
      * 统计日期
      */
     @Column(name = "count_date")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
     private Date countDate;
 
 

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

@@ -31,16 +31,17 @@ 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();
+		Integer type = branchCompanyVehicleCountDTO.getType() == null ? 1 : branchCompanyVehicleCountDTO.getType();
 		branchCompanyVehicleCountDTO.setPage(pageNo);
 		branchCompanyVehicleCountDTO.setLimit(pageSize);
-		if (branchCompanyVehicleCountDTO.getType() == 1) {
+		branchCompanyVehicleCountDTO.setType(type);
+		if (type == 1) {
 			branchCompanyVehicleCountDTO.setDayNum(1);
-		} else if (branchCompanyVehicleCountDTO.getType() == 2) {
+		} else if (type == 2) {
 			branchCompanyVehicleCountDTO.setDayNum(7);
-		} else if (branchCompanyVehicleCountDTO.getType() == 3) {
+		} else if (type == 3) {
 			branchCompanyVehicleCountDTO.setDayNum(getCurrentMonthLastDay());
 		}
 		Query query = new Query(branchCompanyVehicleCountDTO);

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

@@ -17,14 +17,14 @@
       (
       CASE
       WHEN #{type} = 1 THEN
-      vehicle_num / #{dayNum},
+      vehicle_num / #{dayNum}
       WHEN #{type} = 2 THEN
-      vehicle_num / #{dayNum},
+      vehicle_num / #{dayNum}
       WHEN #{type} = 3 THEN
       vehicle_num / #{dayNum}
       END
       )
-      ) AS count from branch_company_vehicle_count
+      ) AS vehicleNum from branch_company_vehicle_count
     <where>
         <if test="companyName != null and companyName != ''">
           and company_name like concat('%', #{companyName}, '%')