diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java index 13c5892d..d69eb086 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java @@ -105,10 +105,11 @@ public class ProductTypeController extends ControllerBase{ /** * 获取类型列表用于排序 + * @param seriesNumber 系列批次号 */ @GetMapping("/getTypeListForSort") - public ApiResult> getTypeListForSort(){ - return ApiResult.success(productTypeService.getListForSort()); + public ApiResult> getTypeListForSort(@Valid @RequestParam @NotNull String seriesNumber){ + return ApiResult.success(productTypeService.getListForSort(seriesNumber)); } /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java index 4502ee1e..aaa472b7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java @@ -33,5 +33,5 @@ public interface ProductTypeMapper extends BaseMapper { List getSimpleListByLanguage(String batchNumber, String language); - List getListForSort(); + List getListForSort(String seriesNumber); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java index f6568db2..02ee84cc 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java @@ -40,7 +40,7 @@ public interface IProductTypeService extends IService { void deleteByParent(String name); - List getListForSort(); + List getListForSort(String seriesNumber); void saveSort(SortSaveRequest request); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java index ac58a811..1315e4af 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java @@ -266,8 +266,8 @@ public class ProductTypeServiceImpl extends ServiceImpl getListForSort() { - return baseMapper.getListForSort(); + public List getListForSort(String seriesNumber) { + return baseMapper.getListForSort(seriesNumber); } @Transactional diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml index 974f375f..d3580615 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml @@ -97,7 +97,7 @@ select * ,(SELECT `name` FROM product_series WHERE batch_number=series_number AND state!=2 ORDER BY state DESC LIMIT 1) as 'seriesName' from product_type - where enable=1 and state=1 + where enable=1 and state=1 and series_number=#{seriesNumber} order by seriesName, sort