From bb3dd7d8926118fbfc374cf58629f2363d7dba15 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 6 Jul 2023 17:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=BA=95=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BirActivityCenterGoodsMapper.java | 1 + .../BirActivityCenterGoodsServiceImpl.java | 8 +++ .../impl/BirBaseActivityServiceImpl.java | 2 - .../controller/TbsCostApplyController.java | 5 +- .../tbs/entity/bo/TbsCostApplyActivityBo.java | 3 ++ .../service/impl/TbsActivityServiceImpl.java | 1 + .../mapper/bir/TbsActivityTemplateMapper.xml | 50 +++++++++++++++++++ 7 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/mapper/bir/TbsActivityTemplateMapper.xml diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java index 4a10f785..f91b9a49 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java @@ -10,5 +10,6 @@ import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; */ public interface BirActivityCenterGoodsMapper extends BaseMapper { + } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index 850c99bf..32ed1938 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -1,6 +1,9 @@ package com.qs.serve.modules.bir.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.modules.tbs.entity.TbsActivity; +import com.qs.serve.modules.tbs.entity.TbsActivityCenter; +import com.qs.serve.modules.tbs.service.TbsActivityCenterGoodsService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -18,5 +21,10 @@ import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper; @AllArgsConstructor public class BirActivityCenterGoodsServiceImpl extends ServiceImpl implements BirActivityCenterGoodsService { + private TbsActivityCenterGoodsService centerGoodsService; + + + + } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index 6abc32e4..da30fc0a 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -179,9 +179,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl list : CollectionUtil.createList(birBaseActivities,500)){ this.saveBatch(birBaseActivities); -// } } } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 55b386f9..afc08253 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -275,14 +275,15 @@ public class TbsCostApplyController { //entity.setId(IdUtil.getSnowFlakeId()); entity.setCode("CA"+IdUtil.timeStampId()); entity.setTemplateId(param.getTemplateId()); + entity.setTemplateTitle(param.getTemplateTitle()); + activityBo.setTemplateId(param.getTemplateId()); + activityBo.setTemplateTitle(param.getTemplateTitle()); entity.setSupplierCode(supplier.getCode()); entity.setSupplierName(supplier.getName()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); entity.setUserId(sysUser.getId()); entity.setUserCode(sysUser.getCode()); entity.setUserName(sysUser.getName()); - entity.setTemplateTitle(activityBo.getTemplateTitle()); - entity.setTemplateId(activityBo.getTemplateId()); tbsCostApplyService.save(entity); activityBo.setCostApplyId(entity.getId()); ValidateTools.valid(activityBo); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyActivityBo.java index 34b18bda..f9d17c1e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyActivityBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostApplyActivityBo.java @@ -21,4 +21,7 @@ public class TbsCostApplyActivityBo { @NotNull Long templateId; + /** 模板标题 */ + private String templateTitle; + } 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 3600b360..0b3f04d3 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 @@ -131,6 +131,7 @@ public class TbsActivityServiceImpl extends ServiceImpla.toString()).collect(Collectors.joining(",")); activity.setTemplateBudgetIds(budgetIds); } + activity.setTemplateTitle(activityBo.getTemplateTitle()); activity.setActStartDate(activityBo.getActStartDate()); activity.setActEndDate(activityBo.getActEndDate()); activity.setPreStartDate(activityBo.getPreStartDate()); diff --git a/src/main/resources/mapper/bir/TbsActivityTemplateMapper.xml b/src/main/resources/mapper/bir/TbsActivityTemplateMapper.xml new file mode 100644 index 00000000..c7d77dbd --- /dev/null +++ b/src/main/resources/mapper/bir/TbsActivityTemplateMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + tbs_activity_template.`id`, + tbs_activity_template.`template_name`, + tbs_activity_template.`template_state`, + tbs_activity_template.`template_value`, + tbs_activity_template.`sale_region_flag`, + tbs_activity_template.`biz_region_flag`, + tbs_activity_template.`contract_flag`, + tbs_activity_template.`cost_theme`, + tbs_activity_template.`cost_theme_edit_flag`, + tbs_activity_template.`pre_remark`, + tbs_activity_template.`remark`, + tbs_activity_template.`start_time`, + tbs_activity_template.`end_time`, + tbs_activity_template.`create_time`, + tbs_activity_template.`create_by`, + tbs_activity_template.`update_time`, + tbs_activity_template.`update_by`, + tbs_activity_template.`tenant_id`, + tbs_activity_template.`del_flag` + + + +