Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehicleDispatchInfoDto.java

@@ -9,8 +9,11 @@ import java.util.List;
 @Data
 public class VehicleDispatchInfoDto extends PageParam {
 
-    @ApiModelProperty(value = "分公司")
-    private List<Integer> companyList;
+    @ApiModelProperty(value = "分公司id")
+    private String companyId;
+
+    @ApiModelProperty(value = "片区id")
+    private String zoneId;
 
     @ApiModelProperty(value = "状态")
     private Integer status;
@@ -18,5 +21,9 @@ public class VehicleDispatchInfoDto extends PageParam {
     @ApiModelProperty(value = "预定月份")
     private String dispatchMonth;
 
+    @ApiModelProperty(value = "预定月份")
+    private List<Integer> companyList;
+
+
 
 }

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

@@ -60,7 +60,9 @@ public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,Ve
         if (userDTO != null) {
             List<Integer> companyList=new ArrayList<>();
             if (userDTO.getDataAll() == 1) {
-                companyList=dispatchInfoDto.getCompanyList();
+                String zoneId= dispatchInfoDto.getZoneId();
+                String companyId=dispatchInfoDto.getCompanyId();
+                companyList=vehicleBiz.dataCompany(zoneId,companyId);
             }else {
                 companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
             }

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

@@ -8,6 +8,8 @@
         SELECT
         DISTINCT
         i.id,
+        i.account_id as accountId,
+        i.account_name as accountName,
         i.company_id as companyId,
         c.`name` as companyName,
         i.mode_id as modeId,
@@ -72,6 +74,6 @@
             </trim>
             )
         </where>
-        order  by  i.actual_start_date
+        order  by  r.actual_start_date
     </select>
 </mapper>
\ No newline at end of file