diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java index 711519a4bf..b727e895d4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java @@ -12,6 +12,10 @@ import lombok.Data; @Data public class BaseManufacturerListQuery implements Query { private static final long serialVersionUID = -8298971718012436562L; - @ApiModelProperty("车型sid") - private String modelSid; +// @ApiModelProperty("车型sid") +// private String modelSid; 作废 + + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java index e599055168..7663b488c5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java @@ -37,5 +37,8 @@ public class BaseVehicleActualSales extends BaseEntity { @ApiModelProperty("分公司sid") private String useOrgSid; - + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java index 5f35931cfe..acce4d0621 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java @@ -45,4 +45,9 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { private String useOrgName; @ApiModelProperty("分公司sid") private String useOrgSid; + + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java index a49160a8ee..6d2c236153 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java @@ -50,5 +50,8 @@ public class BaseVehicleActualSalesDto implements Dto { @ApiModelProperty("分公司sid") private String useOrgSid; - + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java index 897ad65b78..1ee43ede2c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java @@ -60,4 +60,7 @@ public class BaseVehmodelConfigQuerys implements Query { private String configName; @ApiModelProperty(value = "调入分公司sid") private String buyerOrgSid; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index ddbcf3adb0..b9610f3cc1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -72,4 +72,9 @@ public class BusVehicleApply extends BaseEntity { @ApiModelProperty("采购部门sid") private String orgDeptSid; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java index 3c52bba8ac..e4fb99e995 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -62,4 +62,9 @@ public class BusVehicleApplyDetailsVo implements Vo { private String orgDeptName; @ApiModelProperty("采购部门sid") private String orgDeptSid; + + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 7a55d26bb0..077d74a500 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -72,4 +72,9 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty("采购部门sid") private String orgDeptSid; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index a07f2db8df..59b3abbef8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java @@ -118,7 +118,7 @@ public interface BaseManufacturerMapper extends BaseMapper { List> bankNamesDown(String manufacturerSid); - List selectNameByOrg(@Param("modelSid") String modelSid); + List selectNameByOrg(@Param("carBrandSid") String carBrandSid); BaseManufacturer fetchByManBankSid(String s); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index c3f828e67d..280ffac0a4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -169,13 +169,25 @@ AND isDelete = 0 + + + + + + + + + + + + +