From ea11858f0daf1aae36a1c327d7d98cf370975186 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Wed, 25 Jun 2025 14:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E4=BA=BA=E5=91=98=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CoscoCategoryLibraryServiceImpl.java    | 8 +++++---
 .../CoscoCategoryLibrarySupplierApplyServiceImpl.java    | 5 +++--
 .../service/impl/CoscoEvaluateLevelServiceImpl.java      | 7 ++++---
 .../CoscoEvaluateTemplateIndicatorStServiceImpl.java     | 9 +++++----
 .../service/impl/CoscoEvaluateTemplateServiceImpl.java   | 7 ++++---
 5 files changed, 21 insertions(+), 15 deletions(-)

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 fc2e3b8..c359c20 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments;
@@ -73,9 +74,9 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
     @Transactional(rollbackFor = Exception.class)
     public int insertCoscoCategoryLibrary(AddCoscoCategoryLibraryVo coscoCategoryLibrary) {
         coscoCategoryLibrary.setCreateTime(LocalDateTime.now());
-        coscoCategoryLibrary.setCreateBy("1");
+        coscoCategoryLibrary.setCreateBy(SupplierUserConstant.USER_NAME);
         coscoCategoryLibrary.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
-        coscoCategoryLibrary.setApplyDeptId("1");
+        coscoCategoryLibrary.setApplyDeptId("dept001");
         coscoCategoryLibrary.setId(PropertyUtils.getSnowflakeId());
         if (coscoCategoryLibrary.getApproveType().equals(CoscoCategoryConstant.BUILD_TYPE_OFFLINE)) {
             coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS);
@@ -83,7 +84,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
             coscoCategoryLibrarAttachments.setId(PropertyUtils.getSnowflakeId());
             coscoCategoryLibrarAttachments.setCategoryLibraryId(coscoCategoryLibrary.getId());
             coscoCategoryLibrarAttachments.setCreateTime(LocalDateTime.now());
-            coscoCategoryLibrarAttachments.setCreateBy("1");
+            coscoCategoryLibrarAttachments.setCreateBy(SupplierUserConstant.USER_NAME);
             coscoCategoryLibrarAttachments.setUpdateTime(LocalDateTime.now());
             coscoCategoryLibrarAttachmentsMapper.insertCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachments);
         } else {
@@ -202,6 +203,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
         CoscoCategoryLibrary coscoCategoryLibrary = coscoCategoryLibraryMapper.selectCoscoCategoryLibraryById(coscoCategoryVO.getId());
         //数据同步
         //返回值添加审批工作流id
+        coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_APPROVING);
         coscoCategoryLibrary.setWorkFlowId(PropertyUtils.getSnowflakeId());
         coscoCategoryLibrary.setLastUpdateTime(LocalDateTime.now());
         return coscoCategoryLibraryMapper.updateCoscoCategoryLibrary(coscoCategoryLibrary);
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 7a34962..c94d6dd 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
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
@@ -69,8 +70,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
     public int insertCoscoCategoryLibrarySupplierApply(AddCoscoCategoryLibrarySupplierApplyVo coscoCategoryLibrarySupplierApply) {
         coscoCategoryLibrarySupplierApply.setCreateTime(LocalDateTime.now());
         coscoCategoryLibrarySupplierApply.setId(PropertyUtils.getSnowflakeId());
-        coscoCategoryLibrarySupplierApply.setCreateBy("1");
-        coscoCategoryLibrarySupplierApply.setUpdateBy("1");
+        coscoCategoryLibrarySupplierApply.setCreateBy(SupplierUserConstant.USER_NAME);
+        coscoCategoryLibrarySupplierApply.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoCategoryLibrarySupplierApply.setUpdateDate(LocalDateTime.now());
         coscoCategoryLibrarySupplierApplyMapper.insertCoscoCategoryLibrarySupplierApply(coscoCategoryLibrarySupplierApply);
         coscoCategoryLibrarySupplierService.saveSupplierIds(coscoCategoryLibrarySupplierApply.getId(), coscoCategoryLibrarySupplierApply.getCategoryLibraryId(), coscoCategoryLibrarySupplierApply.getSupplierIds());
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
index 5f66aae..7557ff7 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateLevelMapper;
@@ -51,11 +52,11 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
      */
     @Override
     public int insertCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
-        coscoEvaluateLevel.setCreateBy("admin");
+        coscoEvaluateLevel.setCreateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateLevel.setCreateTime(new Date());
         coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
 
-        coscoEvaluateLevel.setUpdateBy("admin");
+        coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateLevel.setUpdateTime(new Date());
         return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
     }
@@ -68,7 +69,7 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
      */
     @Override
     public int updateCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
-        coscoEvaluateLevel.setUpdateBy("admin");
+        coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateLevel.setUpdateTime(new Date());
         return coscoEvaluateLevelMapper.updateCoscoEvaluateLevel(coscoEvaluateLevel);
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java
index 5e1ba40..156ab4a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorNd;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo;
@@ -103,8 +104,8 @@ public class CoscoEvaluateTemplateIndicatorStServiceImpl implements ICoscoEvalua
         for (CoscoEvaluateTemplateIndicatorSt indicatorSt : indicatorStList) {
             indicatorSt.setTemplateId(templateVo.getId());
             indicatorSt.setUpdateTime(new Date());
-            indicatorSt.setUpdateBy("admin");
-            indicatorSt.setCreateBy("admin");
+            indicatorSt.setUpdateBy(SupplierUserConstant.USER_NAME);
+            indicatorSt.setCreateBy(SupplierUserConstant.USER_NAME);
             indicatorSt.setId(PropertyUtils.getSnowflakeId());
             indicatorSt.setCreateTime(new Date());
             List<CoscoEvaluateTemplateIndicatorNd> indicatorNdList = indicatorSt.getIndicatorNdList();
@@ -112,8 +113,8 @@ public class CoscoEvaluateTemplateIndicatorStServiceImpl implements ICoscoEvalua
                 indicatorNd.setTemplateId(templateVo.getId());
                 indicatorNd.setIndicatorStId(indicatorSt.getId());
                 indicatorNd.setUpdateTime(new Date());
-                indicatorNd.setUpdateBy("admin");
-                indicatorNd.setCreateBy("admin");
+                indicatorNd.setUpdateBy(SupplierUserConstant.USER_NAME);
+                indicatorNd.setCreateBy(SupplierUserConstant.USER_NAME);
                 indicatorNd.setId(PropertyUtils.getSnowflakeId());
                 indicatorNd.setCreateTime(new Date());
                 addAll.add(indicatorNd);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
index 4dd78c4..051e307 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
@@ -8,6 +8,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
@@ -82,8 +83,8 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
         templateVo.setCreateTime(new Date());
         templateVo.setId(PropertyUtils.getSnowflakeId());
         templateVo.setUpdateTime(new Date());
-        templateVo.setCreateBy("admin");
-        templateVo.setUpdateBy("admin");
+        templateVo.setCreateBy(SupplierUserConstant.USER_NAME);
+        templateVo.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
         /**
          * 添加一级二级评价想信息
@@ -101,7 +102,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
     @Override
     public int updateCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) {
         templateVo.setUpdateTime(new Date());
-        templateVo.setUpdateBy("admin");
+        templateVo.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateTemplateMapper.updateCoscoEvaluateTemplate(templateVo);
         /**
          * 添加一级二级评价想信息