From aadfd3f16b99d3c495fb6b0097e949c2788b60e1 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 5 Jan 2023 16:54:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=97=A5=E5=BF=97-=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/entity/TbsActivityCenterGoods.java | 3 + .../modules/tbs/entity/TbsBudgetCostItem.java | 3 + .../modules/tbs/entity/TbsBudgetLog.java | 33 +++++++-- .../tbs/entity/dto/TbsBudgetCostResult.java | 4 ++ .../service/TbsBudgetApplicationService.java | 1 + .../service/impl/TbsActivityServiceImpl.java | 1 + .../service/impl/TbsCostApplyServiceImpl.java | 70 +++++++++++++++++-- 7 files changed, 106 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java index a30af49c..91ef0162 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java @@ -45,6 +45,9 @@ public class TbsActivityCenterGoods implements Serializable { @NotNull(message = "活动id不能为空") private Long activityId; + /** 活动编码 */ + private String activityCode; + /** 科目id */ @NotNull(message = "科目id不能为空") private Long subjectId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java index f3a08311..874aff8c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java @@ -46,6 +46,9 @@ public class TbsBudgetCostItem implements Serializable { @NotNull(message = "活动id不能为空") private Long activityId; + /** 活动编码 */ + private String activityCode; + /** 客户id */ private Long supplierId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java index f98749a4..a8249d59 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java @@ -157,6 +157,34 @@ public class TbsBudgetLog implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 目标类型(brand、category、series、spu、sku) */ + @Length(max = 30,message = "目标类型(brand、category、series、spu、sku)长度不能超过30字") + private String targetType; + + /** 目标id */ + private Long targetId; + + /** 目标编码 */ + @Length(max = 30,message = "目标编码长度不能超过30字") + private String targetCode; + + /** 目标名称 */ + @Length(max = 30,message = "目标名称长度不能超过30字") + private String targetName; + + /** 目标等级路径 */ + @Length(max = 600,message = "目标等级路径长度不能超过600字") + private String targetLevelPathIds; + + /** 目标等级路径 */ + @Length(max = 600,message = "目标等级路径长度不能超过600字") + private String targetLevelPathNames; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -169,11 +197,6 @@ public class TbsBudgetLog implements Serializable { @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; - /** 所属租户 */ - @JsonIgnore - @JsonProperty - private String tenantId; - /** 创建人 */ @TableField(fill = FieldFill.INSERT) private String createBy; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetCostResult.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetCostResult.java index c08e76c8..71a10714 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetCostResult.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetCostResult.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.entity.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.qs.serve.modules.tbs.entity.TbsBudget; import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import lombok.Data; @@ -31,4 +32,7 @@ public class TbsBudgetCostResult { /** 表数据封装 */ private TbsBudgetTableVo tableData; + /** 后台数据数据封装 */ + private List budgetList; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 4041bf41..3a55b6f8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -210,6 +210,7 @@ public class TbsBudgetApplicationService { result.setBudgetMatchList(budgetMatchList); result.setBudgetUnMatchList(budgetUnMatchList); result.setTableData(tableVo); + result.setBudgetList(budgetList); return result; } 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 a2f69f34..b2df9287 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 @@ -259,6 +259,7 @@ public class TbsActivityServiceImpl extends ServiceImpl implements TbsCostApplyService { + private BmsSupplierService supplierService; private TbsBudgetApplicationService budgetApplicationService; private TbsBudgetCostItemService budgetCostItemService; + private TbsBudgetLogService budgetLogService; private SysUserService sysUserService; private SeeYonService seeYonService; @@ -55,6 +60,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl budgetLogList = new ArrayList<>(); + List budgetList = result.getBudgetList(); + for (TbsBudgetCostItem item : allBudgetItem) { + //排除不匹配预算的项 + if(item.getBudgetId().equals(0L)){ + continue; + } + TbsBudget budget = null; + for (TbsBudget tbsBudget : budgetList) { + if(item.getBudgetId().equals(tbsBudget.getId())){ + budget = tbsBudget; + break; + } + } + if(budget==null){ + continue; + } + TbsBudgetLog budgetLog = new TbsBudgetLog(); + budgetLog.setBudgetId(item.getBudgetId()); + budgetLog.setBudgetCode(budget.getBudgetCode()); + budgetLog.setOptType(2); + budgetLog.setOptUserId(sysUser.getId()); + budgetLog.setOptUserCode(sysUser.getCode()); + budgetLog.setOptUserName(sysUser.getName()); + budgetLog.setAmount(item.getCenterGoodsAmount()); + budgetLog.setScheduleId(item.getScheduleId()); + budgetLog.setScheduleItemId(item.getScheduleItemId()); + //budgetLog.setItemName(); + budgetLog.setStartDate(item.getActStartDate().atStartOfDay()); + budgetLog.setEndDate(item.getActEndDate().atStartOfDay()); + budgetLog.setSubjectId(item.getSubjectId()); + budgetLog.setSubjectCode(item.getSubjectCode()); + budgetLog.setSubjectName(item.getSubjectName()); + budgetLog.setCenterId(item.getCenterId()); + budgetLog.setCenterCode(item.getCenterCode()); + budgetLog.setCenterName(item.getCenterName()); + budgetLog.setSupplierId(Long.parseLong(supplier.getId())); + budgetLog.setSupplierCode(supplier.getCode()); + budgetLog.setSupplierName(supplier.getName()); + budgetLog.setActivityId(item.getActivityId()); + budgetLog.setActivityCode(item.getActivityCode()); + budgetLog.setCostApplyId(costApply.getId()); + budgetLog.setCostApplyCode(costApply.getCode()); + budgetLog.setCostApplyTheme(costApply.getChargeTheme()); + budgetLog.setTargetType(item.getTargetType()); + budgetLog.setTargetId(item.getTargetId()); + budgetLog.setTargetCode(item.getTargetCode()); + budgetLog.setTargetName(item.getTargetName()); + budgetLog.setTargetLevelPathIds(item.getTargetLevelPathIds()); + budgetLog.setTargetLevelPathNames(item.getTargetLevelPathNames()); + budgetLogList.add(budgetLog); + } + if(CollectionUtil.isNotEmpty(budgetLogList)){ + budgetLogService.saveBatch(budgetLogList); + } } @Override