From 0cda82e13c6054a1b5ffb878daa9b184df3ec064 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Fri, 4 Jul 2025 10:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E5=8E=A8=E5=BA=9F=E5=BC=83=E7=89=A9?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/kitchen/domain/KitchenWasteDeal.java     |  4 ++++
 .../service/impl/KitchenWasteDealServiceImpl.java | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java
index 3964031..990e7f3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
@@ -106,4 +108,6 @@ public class KitchenWasteDeal extends BaseEntity {
     private LocalDateTime endDateTime;
 
     private String searchValue;
+
+    private List<String> scenePictureList;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java
index c5ed478..6793d11 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java
@@ -1,11 +1,15 @@
 package com.bonus.canteen.core.kitchen.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import cn.hutool.core.collection.CollUtil;
+import com.bonus.canteen.core.common.utils.FileUrlUtil;
 import com.bonus.canteen.core.kitchen.domain.constants.WasteDealTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.kitchen.mapper.KitchenWasteDealMapper;
@@ -46,6 +50,17 @@ public class KitchenWasteDealServiceImpl implements IKitchenWasteDealService {
         if(CollUtil.isNotEmpty(list)) {
             for(KitchenWasteDeal wasteDeal : list) {
                 wasteDeal.setDealTypeName(WasteDealTypeEnum.getDescByKey(wasteDeal.getDealType()));
+                if(StringUtils.isNotBlank(wasteDeal.getScenePicture())) {
+                    List<String> scenePictureList = new ArrayList<>();
+                    String[] contractAttachmentList = StringUtils.split(wasteDeal.getScenePicture(), ",");
+                    if(Objects.nonNull(contractAttachmentList)) {
+                        for(String contractAttachment : contractAttachmentList) {
+                            String finalAttachment = FileUrlUtil.getFileUrl(contractAttachment);
+                            scenePictureList.add(finalAttachment);
+                        }
+                    }
+                    wasteDeal.setScenePictureList(scenePictureList);
+                }
             }
         }
         return list;