Merge remote-tracking branch 'origin/v1.0' into v1.0

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.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 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<TbsActivityCenterGoods> activityCenterGoodsList = activityCenterGoodsService.list(qw);
         activityCenterGoodsList.forEach(TbsActivityCenterGoods::initSpuSkuName);
         activity.setCenterGoodsList(activityCenterGoodsList);
+
+        if(CollectionUtil.isNotEmpty(activity.getAttachIds())){
+            List<String> attachIds = Arrays.asList(activity.getAttachIds());
+            List<SysAttach> attachList = attachService.listByIds(attachIds);
+            activity.setAttachList(attachList);
+        }
     }
 
     /**

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;

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;
 

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java

@@ -113,5 +113,7 @@ public class TbsActivityBo implements Serializable {
 
     private List<Long> templateBudgetIds;
 
+    /** 附件id */
+    private String[] attachIds;
 }
 

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

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

@@ -121,6 +121,7 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 Assert.throwEx("活动不存在");
             }
             activity.setUpdateTime(null);
+            activity.setAttachIds(null);
         }else {
             activity = CopierUtil.copy(activityBo,new TbsActivity());
             String random = String.format("%03d",new Random().nextInt(999));
@@ -150,6 +151,7 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
             activity.setPreActQuantity(activityBo.getPreActQuantity());
             activity.setPreNotActQuantity(activityBo.getPreNotActQuantity());
         }
+        activity.setAttachIds(activityBo.getAttachIds());
         activity.setPreRoiRate(activityBo.getPreRoiRate());
         activity.setActTitle(activityBo.getActTitle());
         boolean isUpdate = activity.getId()!=null;