diff --git a/anrui-base/anrui-base-api/pom.xml b/anrui-base/anrui-base-api/pom.xml index 1bc428d5fb..ea4872eb7b 100644 --- a/anrui-base/anrui-base-api/pom.xml +++ b/anrui-base/anrui-base-api/pom.xml @@ -29,12 +29,12 @@ org.projectlombok lombok - + 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/pom.xml b/anrui-base/anrui-base-biz/pom.xml index 2ac16174a2..2559db65ed 100644 --- a/anrui-base/anrui-base-biz/pom.xml +++ b/anrui-base/anrui-base-biz/pom.xml @@ -19,7 +19,7 @@ com.yxt.messagecenter message-center-api - 0.0.1 + 0.0.1-SNAPSHOT com.yxt @@ -29,37 +29,37 @@ anrui-base-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT anrui-crm-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT anrui-portal-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT anrui-buscenter-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT anrui-scm-api com.yxt.anrui.scm - 0.0.1 + 0.0.1-SNAPSHOT anrui-riskcenter-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT anrui-flowable-api com.yxt.anrui - 0.0.1 + 0.0.1-SNAPSHOT @@ -98,7 +98,7 @@ com.yxt.anrui.fin anrui-fin-api - 0.0.1 + 0.0.1-SNAPSHOT compile diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index d4726e0adc..effcb5371b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -14,7 +14,6 @@ import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; -import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -539,6 +538,7 @@ public class BaseManufacturerService extends MybatisBaseService orgList2 = selectOrgList(type); + orgList2.add(orgSid); HashSet h1 = new HashSet(stringList); HashSet h2 = new HashSet(orgList2); //排除掉已存在类别为分公司的 @@ -553,9 +553,10 @@ public class BaseManufacturerService extends MybatisBaseService