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

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

@@ -38,6 +38,8 @@ public class UsableVeicleDTO extends PageParam {
         String catasStr;
         @ApiModelProperty(value = "分类列表", hidden = true)
         Map<Integer, List<VehiclePlatCata>> catas;
+        @ApiModelProperty("停靠公司")
+        String parkBranchCompanyId;
 
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;

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

@@ -991,10 +991,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         if(StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
             initBookSearchParam(dto, params);
         }
-//        PageHelper.startPage(dto.getPage(), dto.getLimit());
-//        List<UsableVehicleModelVO> lists = mapper.searchUsableModel(params);
-//        PageInfo<UsableVehicleModelVO> usableVehicleModel = new PageInfo<>(lists);
-//        return PageDataVO.pageInfo(usableVehicleModel);
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 

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

@@ -559,6 +559,9 @@
             <if test=" hotSign != null ">
                 and vm.hot_sign = #{hotSign}
             </if>
+            <if test=" parkBranchCompanyId != null ">
+                and v.park_branch_company_id = #{parkBranchCompanyId}
+            </if>
         </where>
     </sql>