diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index b0452673db..620f602d67 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -52,6 +52,16 @@ public interface BaseVehicleFeign { @PostMapping("/pagerList") public ResultBean> pagerList(@RequestBody PagerQuery pq); + /** + * 按照组织层级分页查询 + * + * @param pq + * @return + */ + @ApiOperation("车辆信息按照组织层级分页查询") + @PostMapping("/pagerListByOrgSidPath") + public ResultBean> pagerListByOrgSidPath(@RequestBody PagerQuery pq); + /** * 新增保存 * diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 88a246625d..495db4e840 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -38,6 +38,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return rb.setMsg("接口anrui-base/basevehicle/pagerList无法访问"); } + @Override + public ResultBean> pagerListByOrgSidPath(PagerQuery pq) { + return null; + } + @Override public ResultBean save(BaseVehicleDto dto) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/save无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java index b6870e7fcf..8e559b23fb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java @@ -26,6 +26,8 @@ public class BaseVehicleQuery implements Query { @ApiModelProperty(value = "分公司sid") private String createOrgSid; + @ApiModelProperty(value = "组织全路径") + private String orgSidPath; @ApiModelProperty(value = "车架号") private String vinNo; @ApiModelProperty(value = "车型名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 9d2a2deabf..d85afbde96 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -26,6 +26,8 @@ import java.util.Date; @Data public class BaseVehicleVo implements Vo { + @ApiModelProperty("组织全路径") + private String orgSidPath; @ApiModelProperty("发动机号") private String engineNo; @ApiModelProperty(value = "备注") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 0830d37596..86ccf8e7fc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -13,6 +13,7 @@