diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java index 6fe14e090..bc3fc2330 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java @@ -67,7 +67,7 @@ public class BasicdataFreightEntity extends TenantEntity { * 计算方式;1件 2方 3公斤 */ @ApiModelProperty(value = "计算方式;1件 2方 3公斤") - private Integer formulaMode; + private String formulaMode; /** * 物品名称 */ @@ -137,12 +137,12 @@ public class BasicdataFreightEntity extends TenantEntity { * 服务类型;1 干 2干仓 3干仓配 4干配 */ @ApiModelProperty(value = "服务类型;1 干 2干仓 3干仓配 4干配") - private Integer typeService; + private String typeService; /** * 结算方;1 商场 2工厂 */ @ApiModelProperty(value = "结算方;1 商场 2工厂") - private Integer clearingForm; + private String clearingForm; /** * 一级品类 */ @@ -184,7 +184,7 @@ public class BasicdataFreightEntity extends TenantEntity { * 仓储时间端状态;1 0-30天 2 0-60天 3 60天以上 */ @ApiModelProperty(value = "仓储时间端状态;1 0-30天 2 0-60天 3 60天以上") - private Integer warehousingTimeCharge; + private String warehousingTimeCharge; /** * 仓储时间端费用 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java index 8f87c6f11..d4501cac9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java @@ -90,6 +90,17 @@ public class BasicdataZonePriceController extends BladeController { return R.data(pages); } + /** + * 区域品牌价格表 分页 自定义 + */ + @GetMapping("/listName") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataZonePrice") + public R> pageListName(String name) { + List pages = basicdataZonePriceService.pageListName(name); + return R.data(pages); + } + /** * 区域品牌价格表 自定义分页 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java index 57f21aa83..e60c27569 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java @@ -54,4 +54,6 @@ public interface BasicdataZonePriceMapper extends BaseMapper pageList(IPage page, @Param("param") BasicdataZonePriceEntity basicdataZonePriceEntity); BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice); + + List pageListName(String name); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml index 8d07e87e5..f016c00d3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml @@ -33,6 +33,15 @@ + +