活动底表分割

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<BirActivityCenterGoods> {
 
+
 }
 

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<BirActivityCenterGoodsMapper,BirActivityCenterGoods> implements BirActivityCenterGoodsService {
 
+    private TbsActivityCenterGoodsService centerGoodsService;
+
+
+
+
 }
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -179,9 +179,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
         }
         //保存
-//        for(List<BirBaseActivity> list : CollectionUtil.createList(birBaseActivities,500)){
         this.saveBatch(birBaseActivities);
-//        }
     }
 
 }

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);

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;
+
 }

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java

@@ -131,6 +131,7 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                     .map(a->a.toString()).collect(Collectors.joining(","));
             activity.setTemplateBudgetIds(budgetIds);
         }
+        activity.setTemplateTitle(activityBo.getTemplateTitle());
         activity.setActStartDate(activityBo.getActStartDate());
         activity.setActEndDate(activityBo.getActEndDate());
         activity.setPreStartDate(activityBo.getPreStartDate());

src/main/resources/mapper/bir/TbsActivityTemplateMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.serve.modules.tbs.mapper.TbsActivityTemplateMapper">
+
+    <resultMap id="tbsActivityTemplateMap" type="com.qs.serve.modules.tbs.entity.TbsActivityTemplate" >
+        <result property="id"  column="id"/>
+        <result property="templateName"  column="template_name"/>
+        <result property="templateState"  column="template_state"/>
+        <result property="templateValue"  column="template_value"/>
+        <result property="saleRegionFlag"  column="sale_region_flag"/>
+        <result property="bizRegionFlag"  column="biz_region_flag"/>
+        <result property="contractFlag"  column="contract_flag"/>
+        <result property="costTheme"  column="cost_theme"/>
+        <result property="costThemeEditFlag"  column="cost_theme_edit_flag"/>
+        <result property="preRemark"  column="pre_remark"/>
+        <result property="remark"  column="remark"/>
+        <result property="startTime"  column="start_time"/>
+        <result property="endTime"  column="end_time"/>
+        <result property="createTime"  column="create_time"/>
+        <result property="createBy"  column="create_by"/>
+        <result property="updateTime"  column="update_time"/>
+        <result property="updateBy"  column="update_by"/>
+        <result property="tenantId"  column="tenant_id"/>
+        <result property="delFlag"  column="del_flag"/>
+    </resultMap>
+
+    <sql id="tbsActivityTemplateSql">
+        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`    </sql>
+
+
+</mapper>
+