diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetExcelBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetExcelBo.java index a80e45d1..aaa658c0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetExcelBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetExcelBo.java @@ -16,6 +16,7 @@ import java.util.List; @Data public class TbsBudgetExcelBo implements Serializable { + @NotNull private String budgetCode; /** 成本中心id */ @@ -28,6 +29,7 @@ public class TbsBudgetExcelBo implements Serializable { bizRegion, saleRegion, */ + @NotNull private String centerType; /** @@ -50,6 +52,9 @@ public class TbsBudgetExcelBo implements Serializable { /** 商品名称列表(前端显示为sku) */ private List spuNames; + /** sku名称(不用传) */ + private List skuNames; + /** skuId列表(前端显示为单品) */ private List skuCodes; @@ -57,6 +62,7 @@ public class TbsBudgetExcelBo implements Serializable { private String remark; /** 备注 */ + @NotNull private String scheduleName; private BigDecimal amountYear; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 2b03bc08..558ecf5b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -156,6 +156,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl excelBo.setSeriesNames(getConditionNames(seriesConditions)); excelBo.setSpuNames(getConditionNames(spuConditions)); excelBo.setSkuCodes(getConditionCodes(skuConditions)); + excelBo.setSkuNames(getConditionSkus(skuConditions)); } //拼装考核期项 @@ -210,6 +211,23 @@ public class TbsBudgetServiceImpl extends ServiceImpl return null; } + private List getConditionSkus(List conditions){ + if(CollectionUtil.isNotEmpty(conditions)){ + List strings = new ArrayList<>(); + for (TbsBudgetCondition budgetCondition : conditions) { + try { + String[] names = budgetCondition.getTargetLevelPathNames().split("_"); + String string = names[names.length-2] +"("+ names[names.length-1] +")"; + strings.add(string); + } catch (Exception e) { + log.error("格式错误:{}",budgetCondition.getTargetLevelPathNames()); + } + } + return strings; + } + return null; + } + private List getConditionCodes(List conditions){ if(CollectionUtil.isNotEmpty(conditions)){ return conditions.stream().map(TbsBudgetCondition::getTargetCode).collect(Collectors.toList()); @@ -279,9 +297,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl public void modifyByExcel(TbsBudgetExcelBo budgetBo) { TbsBudget budget = this.getByCode(budgetBo.getBudgetCode()); if(budget!=null){ -// if(budget.getBudgetState().equals(1)){ -// Assert.throwEx("已开启的预算无法编辑"); -// } + if(budget.getBudgetState().equals(1)){ + Assert.throwEx("已开启的预算无法编辑"); + } }else { budget = new TbsBudget(); budget.setBudgetCode(budgetBo.getBudgetCode());