Commit 80591de0 authored by unset's avatar unset

添加筛选字段

parent 4a471242
......@@ -203,11 +203,11 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
* @param limit
* @return
*/
public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort, Integer goodsType) {
public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort, Integer goodsType, String name) {
try {
//标签列表页面
if (sort == null || sort == 0) {
return getPage(page, limit, goodsType);
return getPage(page, limit, goodsType, name);
}
//增加车型页面
......@@ -239,7 +239,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
}
@Cache(key = RedisKey.BRANCH_COMPANY_CATA_PAGE)
private ObjectRestResponse getPage(Integer page, Integer limit, Integer goodsType) {
private ObjectRestResponse getPage(Integer page, Integer limit, Integer goodsType, String name) {
//获取一级标签
WeekendSqls<VehiclePlatCata> weekendSqls = WeekendSqls.<VehiclePlatCata>custom();
if(null != goodsType){
......@@ -247,6 +247,9 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
}
weekendSqls.andEqualTo(VehiclePlatCata::getParentId, 0)
.andEqualTo(VehiclePlatCata::getState, 0);
if (StringUtils.isNotBlank(name)) {
weekendSqls.andLike(VehiclePlatCata::getName, name);
}
Example example = Example.builder(VehiclePlatCata.class)
.where(weekendSqls)
.orderByAsc("rank")
......
......@@ -98,7 +98,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
,@PathVariable Integer limit
,@PathVariable Integer sort){
return baseBiz.getCascades(page,limit,sort,null);
return baseBiz.getCascades(page,limit,sort,null, null);
}
......
......@@ -90,7 +90,7 @@ public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCa
*/
@GetMapping(value = "/operation/getCascades")
public ObjectRestResponse getCascades(PageDTO dto){
return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType(), dto.getName());
}
/**
......@@ -103,13 +103,14 @@ public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCa
@GetMapping(value = "/business/getCascades")
public ObjectRestResponse getBusinessCascades(PageDTO dto){
dto.setSort(1);
return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType(), dto.getName());
}
@Data
public static class PageDTO extends PageParam {
Integer sort;
Integer goodsType;
String name;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment