From 0d7abad4bdc0299b711cd0d8a46ed58467a5ffec Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Mon, 24 Jul 2023 12:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=B7=BB=E5=8A=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/modules/tbs/entity/TbsBudget.java    | 11 ++++++++++-
 .../qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java   |  2 ++
 .../qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java   |  1 +
 .../tbs/service/impl/TbsBudgetServiceImpl.java        | 11 +++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
index aab75398..96431900 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -23,7 +25,7 @@ import javax.validation.constraints.NotBlank;
  * @since 2022-11-12
  */
 @Data
-@TableName("tbs_budget")
+@TableName(value = "tbs_budget", autoResultMap = true)
 public class TbsBudget implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -123,9 +125,16 @@ public class TbsBudget implements Serializable {
     @JsonProperty
     private String delFlag;
 
+    /** 附件id */
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] attachIds;
+
     /** 后端传输dto */
     @TableField(exist = false)
     private List<TbsBudgetCondition> budgetConditionList;
 
+    @TableField(exist = false)
+    private List<?> attachList;
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java
index 7eb426c7..3ec01de6 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java
@@ -74,6 +74,8 @@ public class TbsBudgetBo implements Serializable {
     /** skuId列表(前端显示为单品) */
     private List<Long> skuIds;
 
+    private String[] attachIds;
+
     @Data
     public static class ScheduleItem{
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
index da2b9f8f..ec79d8e8 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
@@ -75,6 +75,7 @@ public class TbsBudgetVo implements Serializable {
     private List<?> spuConditions;
     private List<?> scheduleItem;
     private List<TbsScheduleItemBudget> scheduleItemBudgets;
+    private List<?> attachList;
 
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
index 0f4ca752..cca4d626 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
@@ -17,7 +17,9 @@ import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
+import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
@@ -73,6 +75,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
     private final TbsBudgetCostItemPolicyService tbsBudgetCostItemPolicyService;
     private final VtbFundFlowService vtbFundFlowService;
 
+    private SysAttachService attachService;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void modify(TbsBudgetBo budgetBo) {
@@ -433,6 +438,12 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
             a.setBudgetAmount(logList.stream().map(b->b.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add));
         });
         budgetVo.setScheduleItem(scheduleItemBudgets);
+
+        if(CollectionUtil.isNotEmpty(budget.getAttachIds())){
+            List<String> attachIds = Arrays.asList(budget.getAttachIds());
+            List<SysAttach> attachList = attachService.listByIds(attachIds);
+            budgetVo.setAttachList(attachList);
+        }
         return budgetVo;
     }