From 98ae056ada101cc4b2b58d81a18e578dffdd643b Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Tue, 29 Jul 2025 14:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CoscoCategoryLibraryContain.java | 2 ++ .../impl/CoscoCategoryLibraryServiceImpl.java | 18 ++---------------- ...ategoryLibrarySupplierApplyServiceImpl.java | 4 +--- .../coscoCategory/vo/AddCategoryIdVo.java | 8 ++++++++ .../CoscoCategoryLibraryContainMapper.xml | 12 +++++++----- .../dao/mapper/CoscoCategoryLibraryMapper.xml | 2 +- .../dao/mapper/CoscoSupplierBaseMapper.xml | 2 +- 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java index ae167c3..2ae8d1d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java @@ -27,5 +27,7 @@ public class CoscoCategoryLibraryContain extends BaseEntity { */ private String deptId; + private String categoryName; + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index 7ac0954..add1e16 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -177,19 +177,6 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl 0) { - String[] split = categoryIds.split(","); - StringBuilder builder = new StringBuilder(); - for (String s : split) { - String categoryNameById = coscoCategoryService.getCategoryNameById(s); - builder.append(categoryNameById); - } - coscoCategoryLibraryVo.setCategoryNames(builder.toString()); - } - - - }); } @@ -212,12 +199,11 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(id); StringBuilder sb = new StringBuilder(); for (String s : strings) { - String categoryName = coscoCategoryService.getCategoryNameById(s); if (sb.length() > 0) { sb.append(","); } - if (categoryName != null) { - sb.append(categoryName); + if (s != null) { + sb.append(s); } } vo.setCategoryName(sb.toString()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index 19b64cb..b36b12c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java @@ -45,8 +45,6 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp @Autowired private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService; @Autowired - private ICoscoCategoryService coscoCategoryService; - @Autowired private IOrgService orgService; @Autowired private IUserService userService; @@ -71,7 +69,7 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp if (sb.length() > 0) { sb.append(","); } - sb.append(coscoCategoryService.getCategoryNameById(s)); + sb.append(s); } vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id)); vo.setCategoryName(sb.toString()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCategoryIdVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCategoryIdVo.java index 3eeabb8..7afc9f2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCategoryIdVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCategoryIdVo.java @@ -15,6 +15,14 @@ public class AddCategoryIdVo implements Serializable { * 锁定类型(0.未锁定、1.锁定) */ private Long lockType; + /** + * 品类名称 + */ + private String categoryName; + /** + * 品类类型 + */ + private String categoryType; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml index 569969b..796c663 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml @@ -8,10 +8,11 @@ id="CoscoCategoryLibraryContainResult"> + - select category_library_id, category_id + select category_library_id, category_id,category_name from cosco_category_library_contain @@ -44,10 +45,10 @@ insert into cosco_category_library_contain - ( category_library_id, category_id) + ( category_library_id, category_id,category_name,category_type) values - ( #{item.categoryLibraryId}, #{item.categoryId}) + ( #{item.categoryLibraryId}, #{item.categoryId},#{item.categoryName},#{item.categoryType})