From f6d86b25ee253d1ffaa22f42a0bcaad2b3076657 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 7 Jul 2023 17:58:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/controller/TbsActivityController.java | 15 +++++++++++---- .../qs/serve/modules/tbs/entity/TbsActivity.java | 7 +++++++ .../qs/serve/modules/tbs/entity/TbsCostApply.java | 2 ++ .../modules/tbs/entity/bo/TbsActivityBo.java | 2 ++ .../modules/tbs/entity/bo/TbsCostApplyBo.java | 2 ++ .../tbs/service/impl/TbsActivityServiceImpl.java | 2 ++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 20429060..fa01c335 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -19,7 +19,9 @@ import com.qs.serve.modules.goods.entity.GoodsSpu; 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.SysConfigService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsCenterType; @@ -44,10 +46,7 @@ import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo; import javax.validation.Valid; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -88,6 +87,8 @@ public class TbsActivityController { private final TbsActivityApplicationService tbsActivityApplicationService; private final TbsBudgetService tbsBudgetService; private final TbsBudgetConditionService tbsBudgetConditionService; + private SysAttachService attachService; + /** * 列表 @@ -284,6 +285,12 @@ public class TbsActivityController { List activityCenterGoodsList = activityCenterGoodsService.list(qw); activityCenterGoodsList.forEach(TbsActivityCenterGoods::initSpuSkuName); activity.setCenterGoodsList(activityCenterGoodsList); + + if(CollectionUtil.isNotEmpty(activity.getAttachIds())){ + List attachIds = Arrays.asList(activity.getAttachIds()); + List attachList = attachService.listByIds(attachIds); + activity.setAttachList(attachList); + } } /** 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 4552e5f9..34c5390d 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 @@ -193,6 +193,13 @@ public class TbsActivity implements Serializable { private String templateBudgetIds; + /** 附件id */ + @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) + private String[] attachIds; + + @TableField(exist = false) + private List attachList; + /** 产品类型 */ @TableField(exist = false) private String goodsType; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index 7cad8aaf..33ab08b7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -148,6 +148,8 @@ public class TbsCostApply implements Serializable { private String templateTitle; + private Integer costThemeEditFlag; + @TableField(exist = false) private String affairId; 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 5cc44d95..53fc8656 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 @@ -113,5 +113,7 @@ public class TbsActivityBo implements Serializable { private List templateBudgetIds; + /** 附件id */ + private String[] attachIds; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java index a337b23c..edf75e69 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyBo.java @@ -46,5 +46,7 @@ public class TbsCostApplyBo implements Serializable { */ private Integer contractFlag; + private Integer costThemeEditFlag; + } 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 0b3f04d3..6bd37be9 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 @@ -121,6 +121,7 @@ public class TbsActivityServiceImpl extends ServiceImpl