From 28febf0e2ec583450f0e310558856e05d9e5b824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 8 Jul 2025 15:08:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B1=BB=E5=9E=8B=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E5=88=97=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/admin/controller/ProductTypeController.java | 5 +++--
 .../mobilebroken/repository/mapper/ProductTypeMapper.java    | 2 +-
 .../mobilebroken/repository/service/IProductTypeService.java | 2 +-
 .../repository/service/impl/ProductTypeServiceImpl.java      | 4 ++--
 .../src/main/resources/mapper/ProductTypeMapper.xml          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

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<List<ProductTypeSearchVO>> getTypeListForSort(){
-        return ApiResult.success(productTypeService.getListForSort());
+    public ApiResult<List<ProductTypeSearchVO>> 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<ProductType> {
 
     List<ProductTypeSimpleVO> getSimpleListByLanguage(String batchNumber, String language);
 
-    List<ProductTypeSearchVO> getListForSort();
+    List<ProductTypeSearchVO> 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<ProductType> {
 
     void deleteByParent(String name);
 
-    List<ProductTypeSearchVO> getListForSort();
+    List<ProductTypeSearchVO> 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 4d284b89..20d6d826 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
@@ -262,8 +262,8 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
     }
 
     @Override
-    public List<ProductTypeSearchVO> getListForSort() {
-        return baseMapper.getListForSort();
+    public List<ProductTypeSearchVO> 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 8c42e2dc..bacabdea 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
     </select>
 </mapper>