From 9648d7021376d9f71ebd5c40e9e9946be0dce259 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Wed, 5 Jul 2023 17:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98activity=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=A8=A1=E6=9D=BF=E6=8C=87=E5=AE=9A=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97ids=EF=BC=8C=E5=A6=82=E6=A8=A1=E6=9D=BF=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E5=AD=98=E5=9C=A8=EF=BC=8C=E8=AE=A1=E7=AE=97=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E5=91=BD=E4=B8=AD=E6=97=B6=EF=BC=8C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97ids?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qs/serve/modules/tbs/entity/TbsActivity.java  | 5 +++++
 .../com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java  | 2 ++
 .../modules/tbs/service/TbsBudgetApplicationService.java   | 7 +++++++
 .../modules/tbs/service/impl/TbsActivityServiceImpl.java   | 6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
index f11fade6..c85a89ff 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
@@ -10,14 +10,17 @@ 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 com.qs.serve.modules.bms.entity.BmsSupplier;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 import java.time.Period;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 /**
  * 费用活动 实体类
@@ -186,6 +189,8 @@ public class TbsActivity implements Serializable {
     /** 模板ID */
     private Long templateId;
 
+    private String templateBudgetIds;
+
     /** 产品类型 */
     @TableField(exist = false)
     private String goodsType;
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
index a825878b..65a5ec4b 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
@@ -108,5 +108,7 @@ public class TbsActivityBo implements Serializable {
     /** 模板值 */
     private String templateValue;
 
+    private List<Long> templateBudgetIds;
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index 22c6e5aa..207eeac4 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.consts.SysConfigKey;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.dto.CostSortWrapper;
@@ -762,6 +763,12 @@ public class TbsBudgetApplicationService {
         for (TbsActivity activity : activityList) {
             List<TbsScheduleItemBudget> budgetItemList = tbsScheduleItemBudgetService
                     .betweenDateList(activity.getPreStartDate(),activity.getPreEndDate());
+
+            if(StringUtils.hasText(activity.getTemplateBudgetIds())){
+                List<Long> budgetIdsList = Arrays.stream(activity.getTemplateBudgetIds().split(",")).map(Long::parseLong)
+                        .collect(Collectors.toList());
+                budgetItemList = budgetItemList.stream().filter(a->budgetIdsList.contains(a.getBudgetId())).collect(Collectors.toList());
+            }
             //设置关联用于后面条件过滤
             activity.setScheduleItemBudgetList(budgetItemList);
             if(CollectionUtil.isNotEmpty(budgetItemList)){
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
index 7ad1ceec..62b28855 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
@@ -120,11 +120,17 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
             if(activity==null){
                 Assert.throwEx("活动不存在");
             }
+            activity.setUpdateTime(null);
         }else {
             activity = CopierUtil.copy(activityBo,new TbsActivity());
             String random = String.format("%03d",new Random().nextInt(999));
             activity.setActivityCode("G"+ StringUtils.genShortId() + random);
         }
+        if(activityBo.getTemplateBudgetIds()!=null && activityBo.getTemplateBudgetIds().size()>0){
+            String budgetIds = activityBo.getTemplateBudgetIds().stream()
+                    .map(a->a.toString()).collect(Collectors.joining(","));
+            activity.setTemplateBudgetIds(budgetIds);
+        }
         activity.setActStartDate(activityBo.getActStartDate());
         activity.setActEndDate(activityBo.getActEndDate());
         activity.setPreStartDate(activityBo.getPreStartDate());