diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java b/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java index 3df444de..3de4e932 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java @@ -319,6 +319,10 @@ public class BirActivityCenterGoods implements Serializable { @TableField(condition = SqlCondition.LIKE) private String supplierName; + private Long templateId; + + private String templateTitle; + @TableField(condition = SqlCondition.LIKE) private String supplierSaleRegionName; 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 470e022b..5b93391d 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 @@ -23,7 +23,9 @@ import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsActivityCenter; import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.mapper.TbsActivityCenterGoodsMapper; +import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; import com.qs.serve.modules.tbs.service.TbsActivityCenterGoodsService; import com.qs.serve.modules.vtb.common.VtbFundFlowType; import com.qs.serve.modules.vtb.entity.VtbFundFlow; @@ -73,6 +75,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl> collectMap = activityCenterGoodsAllList.stream() .collect(Collectors.groupingBy(TbsActivityCenterGoods::getActivityId)); + List costApplyIds = activityCenterGoodsAllList.stream().map(a->a.getCostApplyId()).distinct().collect(Collectors.toList()); + LambdaQueryWrapper supplierLqw = new LambdaQueryWrapper<>(); supplierLqw.in(BmsSupplier::getId,activityCenterGoodsAllList.stream().map(a->a.getSupplierId()).distinct().collect(Collectors.toList())); List bmsSupplierList = bmsSupplierMapper.selectList(supplierLqw); @@ -157,11 +163,20 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl actReleaseMap = new HashMap<>(); // actReleaseList.forEach(actRelease -> actReleaseMap.put(actRelease.getActivityId(),actRelease.getTotalAmt())); + List costApplyList = tbsCostApplyMapper.selectBatchIds(costApplyIds); + + Map> costApplyMap = costApplyList.stream().collect(Collectors.groupingBy(TbsCostApply::getId)); + for (Long activityId : collectMap.keySet()) { //用于保存的对象列表 List bacgList = new ArrayList<>(); + //创建对象列表 List activityCenterGoodsList = collectMap.get(activityId); + + TbsActivityCenterGoods tempGoods = activityCenterGoodsList.get(0); + TbsCostApply costApply = costApplyMap.get(tempGoods.getCostApplyId()).get(0); + for (TbsActivityCenterGoods activityCenterGoods : activityCenterGoodsList) { LocalDate actStartDate = activityCenterGoods.getPreStartDate(); LocalDate actEndDate = activityCenterGoods.getPreEndDate(); @@ -174,7 +189,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl supplierMap, Map saleRegionMap, Map bizRegionMap) { + Map supplierMap, + Map saleRegionMap, + Map bizRegionMap, + TbsCostApply costApply) { BirActivityCenterGoods entity = new BirActivityCenterGoods(); entity.setActivityCenterGoodsId(activityCenterGoods.getId()); entity.setKeyNum(currDateSplit.getYearMonth()); @@ -262,6 +280,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl