From ed61b79b96ade81d70bda1d89910b869f666ecf1 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Tue, 29 Jul 2025 15:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=81=E7=B1=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/CoscoCategoryLibraryContain.java              | 2 ++
 .../impl/CoscoCategoryLibraryContainServiceImpl.java     | 2 ++
 .../service/impl/CoscoCategoryLibraryServiceImpl.java    | 5 +++--
 .../CoscoCategoryLibrarySupplierApplyServiceImpl.java    | 2 ++
 .../dao/mapper/CoscoCategoryLibraryMapper.xml            | 2 +-
 .../mapper/CoscoCategoryLibrarySupplierApplyMapper.xml   | 9 +++++++--
 6 files changed, 17 insertions(+), 5 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 2ae8d1d..7e8a5cb 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
@@ -29,5 +29,7 @@ public class CoscoCategoryLibraryContain extends BaseEntity {
 
     private String categoryName;
 
+    private String categoryType;
+
 
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
index f523964..16dee95 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
@@ -106,6 +106,8 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
             coscoCategoryLibraryContain.setCategoryLibraryId(id);
             coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
             coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
+            coscoCategoryLibraryContain.setCategoryName(categoryId.getCategoryName());
+            coscoCategoryLibraryContain.setCategoryType(categoryId.getCategoryType());
             coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());
             list.add(coscoCategoryLibraryContain);
         }
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 add1e16..079e56e 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
@@ -42,8 +42,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
     private ICoscoCategoryLibrarySupplierApplyService coscoCategoryLibrarySupplierApplyService;
     @Autowired
     private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService;
-    @Autowired
-    private ICoscoCategoryService coscoCategoryService;
+
     @Autowired
     private IUserService userService;
     @Autowired
@@ -206,6 +205,8 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
                 sb.append(s);
             }
         }
+        OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibrary.getApplyDeptId());
+        vo.setDeptName(orgDeptInfo.getDeptName());
         vo.setCategoryName(sb.toString());
         vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
         //获取添加品类
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 b36b12c..45df885 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
@@ -71,6 +71,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
             }
             sb.append(s);
         }
+        OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
+        vo.setDeptName(orgDeptInfo.getDeptName());
         vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
         vo.setCategoryName(sb.toString());
         vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id));
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
index 3c731a7..c57f6ce 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
@@ -223,7 +223,7 @@
         SELECT
         ccl.id,
         ccl.name,
-        GROUP_CONCAT(case when cclc.category_type=0 then DISTINCT cclc.category_name SEPARATOR ', ' end) AS categoryNames,
+        GROUP_CONCAT(DISTINCT CASE WHEN cclc.category_type = 0 THEN  cclc.category_name ELSE NULL END SEPARATOR ', ') AS categoryNames,
         ccl.create_by,
         ccl.apply_dept_id,
         ccl.term_of_validity AS termOfValidity,
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
index b4e7054..309245e 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
@@ -78,7 +78,7 @@
                ccl.name,
                ccl.area,
                ccl.id               as libraryId,
-               '张三'               as applyUser,
+               ccl.dept_id as deptId,
                ccl.create_time      as applyTime,
                cclsa.approve_status as approveStatus
         from cosco_category_library_supplier_apply cclsa
@@ -176,7 +176,12 @@
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
         select csb.name               as name,
                csb.enterprise_type    as area,
-               csb.social_credit_code as unifiedSocialCreditCode,
+               CASE
+                   WHEN csb.supplier_type = 'dvs' THEN social_credit_code
+                   WHEN csb.supplier_type = 'ovs' THEN vat
+                   WHEN csb.supplier_type = 'pe' THEN id_card
+                   ELSE NULL
+                   END AS unifiedSocialCreditCode,
                csb.supplier_type      as supplierCategory,
                csb.id
         from cosco_category_library_supplier_apply cclsa