From 4570baa4cd2260445663e62647523b368e0c3a46 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 15 Jul 2025 10:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=93=81=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/ims/domain/SupplierBindMaterial.java  |  5 +++++
 .../impl/SupplierBindMaterialServiceImpl.java  | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
index 008bc24..ffe1baf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.ToString;
 import com.bonus.common.core.web.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 原料绑定供应商对象 ims_supplier_bind_material
  * 
@@ -45,6 +47,9 @@ public class SupplierBindMaterial extends BaseEntity {
     /** 备选供应商 */
     @Excel(name = "备选供应商")
     @ApiModelProperty(value = "备选供应商")
+    private List<Supplier> alternativeSuppliers;
+
+    /** 备选供应商list转json */
     private String alternativeSupplier;
 
     /** 是否供应 */
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierBindMaterialServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierBindMaterialServiceImpl.java
index f77ba16..f010f82 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierBindMaterialServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierBindMaterialServiceImpl.java
@@ -1,8 +1,12 @@
 package com.bonus.canteen.core.ims.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.Supplier;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.houqin.utils.JacksonUtil;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.ims.mapper.SupplierBindMaterialMapper;
@@ -28,7 +32,9 @@ public class SupplierBindMaterialServiceImpl implements ISupplierBindMaterialSer
      */
     @Override
     public SupplierBindMaterial selectSupplierBindMaterialById(Long id) {
-        return supplierBindMaterialMapper.selectSupplierBindMaterialById(id);
+        SupplierBindMaterial supplierBindMaterial = supplierBindMaterialMapper.selectSupplierBindMaterialById(id);
+        supplierBindMaterial.setAlternativeSuppliers((List<Supplier>) JacksonUtil.readValue(supplierBindMaterial.getAlternativeSupplier(), List.class));
+        return supplierBindMaterial;
     }
 
     /**
@@ -39,7 +45,11 @@ public class SupplierBindMaterialServiceImpl implements ISupplierBindMaterialSer
      */
     @Override
     public List<SupplierBindMaterial> selectSupplierBindMaterialList(SupplierBindMaterial supplierBindMaterial) {
-        return supplierBindMaterialMapper.selectSupplierBindMaterialList(supplierBindMaterial);
+        List<SupplierBindMaterial> list = supplierBindMaterialMapper.selectSupplierBindMaterialList(supplierBindMaterial);
+        for (SupplierBindMaterial bindMaterial : list) {
+            bindMaterial.setAlternativeSuppliers((List<Supplier>) JacksonUtil.readValue(bindMaterial.getAlternativeSupplier(), List.class));
+        }
+        return list;
     }
 
     /**
@@ -51,7 +61,9 @@ public class SupplierBindMaterialServiceImpl implements ISupplierBindMaterialSer
     @Override
     public int insertSupplierBindMaterial(SupplierBindMaterial supplierBindMaterial) {
         supplierBindMaterial.setCreateTime(DateUtils.getNowDate());
+        supplierBindMaterial.setCreateBy(SecurityUtils.getUsername());
         try {
+            supplierBindMaterial.setAlternativeSupplier(JacksonUtil.writeValueAsString(supplierBindMaterial.getAlternativeSuppliers()));
             return supplierBindMaterialMapper.insertSupplierBindMaterial(supplierBindMaterial);
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
@@ -67,7 +79,9 @@ public class SupplierBindMaterialServiceImpl implements ISupplierBindMaterialSer
     @Override
     public int updateSupplierBindMaterial(SupplierBindMaterial supplierBindMaterial) {
         supplierBindMaterial.setUpdateTime(DateUtils.getNowDate());
+        supplierBindMaterial.setUpdateBy(SecurityUtils.getUsername());
         try {
+            supplierBindMaterial.setAlternativeSupplier(JacksonUtil.writeValueAsString(supplierBindMaterial.getAlternativeSuppliers()));
             return supplierBindMaterialMapper.updateSupplierBindMaterial(supplierBindMaterial);
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());