|
|
@ -156,6 +156,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget> |
|
|
|
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<TbsBudgetMapper,TbsBudget> |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
private List<String> getConditionSkus(List<TbsBudgetCondition> conditions){ |
|
|
|
if(CollectionUtil.isNotEmpty(conditions)){ |
|
|
|
List<String> 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<String> getConditionCodes(List<TbsBudgetCondition> conditions){ |
|
|
|
if(CollectionUtil.isNotEmpty(conditions)){ |
|
|
|
return conditions.stream().map(TbsBudgetCondition::getTargetCode).collect(Collectors.toList()); |
|
|
@ -279,9 +297,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget> |
|
|
|
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()); |
|
|
|