jcyen
/
jsl-questionnaire-base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

预算金额大部份要弃用

v1.0
15989082884@163.com 2 years ago
parent
11eb1cfaad
commit
47779d75a8
4 changed files with 230 additions and 230 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
  2. 12
      src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
  3. 4
      src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java
  4. 380
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

64
src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
View File

@ -253,44 +253,44 @@ public class TbsBudgetController {
* @param budgetBo * @param budgetBo
* @return 返回错误列表 * @return 返回错误列表
*/ */
@PostMapping("/import") // @PostMapping("/import")
@SysLog(module = SystemModule.Budget, title = "预算", biz = BizType.INSERT) // @SysLog(module = SystemModule.Budget, title = "预算", biz = BizType.INSERT)
@PreAuthorize("hasRole('tbs:budget:insert')") // @PreAuthorize("hasRole('tbs:budget:insert')")
public R<List<TbsBudgetExcelBo>> importBo(@RequestBody @Valid TbsBudgetExcelBatchDto budgetBo){ // public R<List<TbsBudgetExcelBo>> importBo(@RequestBody @Valid TbsBudgetExcelBatchDto budgetBo){
ValidateTools.valid(budgetBo.getItems()); // ValidateTools.valid(budgetBo.getItems());
List<TbsBudgetExcelBo> errorList = new ArrayList<>(); // List<TbsBudgetExcelBo> errorList = new ArrayList<>();
for (int i = 0; i < budgetBo.getItems().size(); i++) { // for (int i = 0; i < budgetBo.getItems().size(); i++) {
TbsBudgetExcelBo item = budgetBo.getItems().get(i); // TbsBudgetExcelBo item = budgetBo.getItems().get(i);
item.setSkuCodes(item.getSkuCodes().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList())); // item.setSkuCodes(item.getSkuCodes().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
item.setSpuNames(item.getSpuNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList())); // item.setSpuNames(item.getSpuNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
item.setCategoryNames(item.getCategoryNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList())); // item.setCategoryNames(item.getCategoryNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
item.setSeriesNames(item.getSeriesNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList())); // item.setSeriesNames(item.getSeriesNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
item.setBrandNames(item.getBrandNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList())); // item.setBrandNames(item.getBrandNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
//
try { // try {
tbsBudgetService.modifyByExcel(item); // tbsBudgetService.modifyByExcel(item);
} catch (BusinessException e) { // } catch (BusinessException e) {
item.setErrorMsg("预算编码["+item.getBudgetCode()+"]"+e.getMessage()); // item.setErrorMsg("预算编码["+item.getBudgetCode()+"]"+e.getMessage());
errorList.add(item); // errorList.add(item);
}catch (Exception e) { // }catch (Exception e) {
log.error(e.getMessage()); // log.error(e.getMessage());
item.setErrorMsg("预算编码["+item.getBudgetCode()+"]未知错误,请联系管理员"); // item.setErrorMsg("预算编码["+item.getBudgetCode()+"]未知错误,请联系管理员");
errorList.add(item); // errorList.add(item);
} // }
} // }
return R.ok(errorList,"成功导入:"+(budgetBo.getItems().size()-errorList.size())+"条记录,失败数:"+errorList.size()); // return R.ok(errorList,"成功导入:"+(budgetBo.getItems().size()-errorList.size())+"条记录,失败数:"+errorList.size());
} // }
/** /**
* 导出 * 导出
* @param ids * @param ids
* @return * @return
*/ */
@GetMapping("/export") // @GetMapping("/export")
public R<List<TbsBudgetExcelBo>> exportVo(String ids){ // public R<List<TbsBudgetExcelBo>> exportVo(String ids){
List<Long> idsLong = StringUtils.splitIdLong(ids); // List<Long> idsLong = StringUtils.splitIdLong(ids);
return R.ok(tbsBudgetService.listBudgetExcel(idsLong)); // return R.ok(tbsBudgetService.listBudgetExcel(idsLong));
} // }
/** /**
* 删除 * 删除

12
src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
View File

@ -144,12 +144,12 @@ public class TbsScheduleItemBudget implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String budgetCode; private String budgetCode;
public BigDecimal compareTargetExpenseRate(){ // public BigDecimal compareTargetExpenseRate(){
if(budgetAmount!=null&&preDispatchAmount!=null&&preDispatchAmount.compareTo(BigDecimal.ZERO)!=0){ // if(budgetAmount!=null&&preDispatchAmount!=null&&preDispatchAmount.compareTo(BigDecimal.ZERO)!=0){
return budgetAmount.divide(preDispatchAmount,BigDecimal.ROUND_DOWN); // return budgetAmount.divide(preDispatchAmount,BigDecimal.ROUND_DOWN);
} // }
return null; // return null;
} // }
} }

4
src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java
View File

@ -30,13 +30,13 @@ public interface TbsBudgetService extends IService<TbsBudget> {
void startBudget(Long id); void startBudget(Long id);
void modifyByExcel(TbsBudgetExcelBo budgetBo); // void modifyByExcel(TbsBudgetExcelBo budgetBo);
//void modifyByExcelBatch(TbsBudgetExcelBatchDto budgetBo); //void modifyByExcelBatch(TbsBudgetExcelBatchDto budgetBo);
TbsBudget getByCode(String code); TbsBudget getByCode(String code);
List<TbsBudgetExcelBo> listBudgetExcel(List<Long> budgetIds); // List<TbsBudgetExcelBo> listBudgetExcel(List<Long> budgetIds);
TbsBudgetVo toVoEntity(TbsBudget budget); TbsBudgetVo toVoEntity(TbsBudget budget);

380
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
View File

@ -275,101 +275,101 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
} }
@Override // @Override
public List<TbsBudgetExcelBo> listBudgetExcel(List<Long> budgetIds) { // public List<TbsBudgetExcelBo> listBudgetExcel(List<Long> budgetIds) {
List<TbsBudget> budgetList = null; // List<TbsBudget> budgetList = null;
//考核期项 // //考核期项
if (budgetIds==null||budgetIds.size()<1){ // if (budgetIds==null||budgetIds.size()<1){
budgetList = this.list(); // budgetList = this.list();
budgetIds = budgetList.stream().map(TbsBudget::getId).collect(Collectors.toList()); // budgetIds = budgetList.stream().map(TbsBudget::getId).collect(Collectors.toList());
}else { // }else {
budgetList = this.listByIds(budgetIds); // budgetList = this.listByIds(budgetIds);
} // }
if(budgetIds.size()<1){ // if(budgetIds.size()<1){
return null; // return null;
} // }
LambdaQueryWrapper<TbsScheduleItemBudget> lqw2 = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<TbsScheduleItemBudget> lqw2 = new LambdaQueryWrapper<>();
lqw2.in(TbsScheduleItemBudget::getBudgetId,budgetIds); // lqw2.in(TbsScheduleItemBudget::getBudgetId,budgetIds);
List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); // List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw2);
Map<Long,List<TbsScheduleItemBudget>> listScheduleMapByBudgetId = scheduleItemBudgets.stream().collect(Collectors.groupingBy(TbsScheduleItemBudget::getBudgetId)); // Map<Long,List<TbsScheduleItemBudget>> listScheduleMapByBudgetId = scheduleItemBudgets.stream().collect(Collectors.groupingBy(TbsScheduleItemBudget::getBudgetId));
//加载条件 // //加载条件
LambdaQueryWrapper<TbsBudgetCondition> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<TbsBudgetCondition> lqw = new LambdaQueryWrapper<>();
lqw.in(TbsBudgetCondition::getBudgetId,budgetIds); // lqw.in(TbsBudgetCondition::getBudgetId,budgetIds);
List<TbsBudgetCondition> budgetConditions = budgetConditionService.list(lqw); // List<TbsBudgetCondition> budgetConditions = budgetConditionService.list(lqw);
Map<Long,List<TbsBudgetCondition>> listConditionMapByBudgetId = budgetConditions.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId)); // Map<Long,List<TbsBudgetCondition>> listConditionMapByBudgetId = budgetConditions.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId));
//拼装 // //拼装
return budgetList.stream().map(budget->{ // return budgetList.stream().map(budget->{
TbsBudgetExcelBo excelBo = new TbsBudgetExcelBo(); // TbsBudgetExcelBo excelBo = new TbsBudgetExcelBo();
excelBo.setBudgetCode(budget.getBudgetCode()); // excelBo.setBudgetCode(budget.getBudgetCode());
excelBo.setSubjectName(budget.getSubjectName()); // excelBo.setSubjectName(budget.getSubjectName());
excelBo.setCenterType(budget.getCenterType()); // excelBo.setCenterType(budget.getCenterType());
excelBo.setCenterName(budget.getCenterName()); // excelBo.setCenterName(budget.getCenterName());
excelBo.setCenterCode(budget.getCenterCode()); // excelBo.setCenterCode(budget.getCenterCode());
excelBo.setScheduleName(budget.getScheduleName()); // excelBo.setScheduleName(budget.getScheduleName());
excelBo.setRemark(budget.getRemark()); // excelBo.setRemark(budget.getRemark());
//
//拼装条件 // //拼装条件
List<TbsBudgetCondition> budgetConditionsOfBudget = listConditionMapByBudgetId.get(budget.getId()); // List<TbsBudgetCondition> budgetConditionsOfBudget = listConditionMapByBudgetId.get(budget.getId());
if(budgetConditionsOfBudget!=null){ // if(budgetConditionsOfBudget!=null){
Map<String,List<TbsBudgetCondition>> listMap = budgetConditionsOfBudget.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getTargetType)); // Map<String,List<TbsBudgetCondition>> listMap = budgetConditionsOfBudget.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getTargetType));
List<TbsBudgetCondition> brandConditions = listMap.get(TbsGoodsType.brand.name()); // List<TbsBudgetCondition> brandConditions = listMap.get(TbsGoodsType.brand.name());
List<TbsBudgetCondition> categoryConditions = listMap.get(TbsGoodsType.category.name()); // List<TbsBudgetCondition> categoryConditions = listMap.get(TbsGoodsType.category.name());
List<TbsBudgetCondition> seriesConditions = listMap.get(TbsGoodsType.series.name()); // List<TbsBudgetCondition> seriesConditions = listMap.get(TbsGoodsType.series.name());
List<TbsBudgetCondition> spuConditions = listMap.get(TbsGoodsType.spu.name()); // List<TbsBudgetCondition> spuConditions = listMap.get(TbsGoodsType.spu.name());
List<TbsBudgetCondition> skuConditions = listMap.get(TbsGoodsType.sku.name()); // List<TbsBudgetCondition> skuConditions = listMap.get(TbsGoodsType.sku.name());
//
excelBo.setBrandNames(getConditionNames(brandConditions)); // excelBo.setBrandNames(getConditionNames(brandConditions));
excelBo.setCategoryNames(getConditionNames(categoryConditions)); // excelBo.setCategoryNames(getConditionNames(categoryConditions));
excelBo.setSeriesNames(getConditionNames(seriesConditions)); // excelBo.setSeriesNames(getConditionNames(seriesConditions));
excelBo.setSpuNames(getConditionNames(spuConditions)); // excelBo.setSpuNames(getConditionNames(spuConditions));
excelBo.setSkuCodes(getConditionCodes(skuConditions)); // excelBo.setSkuCodes(getConditionCodes(skuConditions));
excelBo.setSkuNames(getConditionSkus(skuConditions)); // excelBo.setSkuNames(getConditionSkus(skuConditions));
} // }
//
//拼装考核期项 // //拼装考核期项
List<TbsScheduleItemBudget> scheduleItemBudgetList = listScheduleMapByBudgetId.get(budget.getId()); // List<TbsScheduleItemBudget> scheduleItemBudgetList = listScheduleMapByBudgetId.get(budget.getId());
if(scheduleItemBudgetList!=null){ // if(scheduleItemBudgetList!=null){
for (TbsScheduleItemBudget itemBudget : scheduleItemBudgetList) { // for (TbsScheduleItemBudget itemBudget : scheduleItemBudgetList) {
if(itemBudget.getItemName().equals("M1")){ // if(itemBudget.getItemName().equals("M1")){
excelBo.setAmountM1(itemBudget.getBudgetAmount()); // excelBo.setAmountM1(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M2")){ // }else if (itemBudget.getItemName().equals("M2")){
excelBo.setAmountM2(itemBudget.getBudgetAmount()); // excelBo.setAmountM2(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M3")){ // }else if (itemBudget.getItemName().equals("M3")){
excelBo.setAmountM3(itemBudget.getBudgetAmount()); // excelBo.setAmountM3(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M4")){ // }else if (itemBudget.getItemName().equals("M4")){
excelBo.setAmountM4(itemBudget.getBudgetAmount()); // excelBo.setAmountM4(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M5")){ // }else if (itemBudget.getItemName().equals("M5")){
excelBo.setAmountM5(itemBudget.getBudgetAmount()); // excelBo.setAmountM5(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M6")){ // }else if (itemBudget.getItemName().equals("M6")){
excelBo.setAmountM6(itemBudget.getBudgetAmount()); // excelBo.setAmountM6(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M7")){ // }else if (itemBudget.getItemName().equals("M7")){
excelBo.setAmountM7(itemBudget.getBudgetAmount()); // excelBo.setAmountM7(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M8")){ // }else if (itemBudget.getItemName().equals("M8")){
excelBo.setAmountM8(itemBudget.getBudgetAmount()); // excelBo.setAmountM8(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M9")){ // }else if (itemBudget.getItemName().equals("M9")){
excelBo.setAmountM9(itemBudget.getBudgetAmount()); // excelBo.setAmountM9(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M10")){ // }else if (itemBudget.getItemName().equals("M10")){
excelBo.setAmountM10(itemBudget.getBudgetAmount()); // excelBo.setAmountM10(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M11")){ // }else if (itemBudget.getItemName().equals("M11")){
excelBo.setAmountM11(itemBudget.getBudgetAmount()); // excelBo.setAmountM11(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("M12")){ // }else if (itemBudget.getItemName().equals("M12")){
excelBo.setAmountM12(itemBudget.getBudgetAmount()); // excelBo.setAmountM12(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("Q1")){ // }else if (itemBudget.getItemName().equals("Q1")){
excelBo.setAmountQ1(itemBudget.getBudgetAmount()); // excelBo.setAmountQ1(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("Q2")){ // }else if (itemBudget.getItemName().equals("Q2")){
excelBo.setAmountQ2(itemBudget.getBudgetAmount()); // excelBo.setAmountQ2(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("Q3")){ // }else if (itemBudget.getItemName().equals("Q3")){
excelBo.setAmountQ3(itemBudget.getBudgetAmount()); // excelBo.setAmountQ3(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("Q4")){ // }else if (itemBudget.getItemName().equals("Q4")){
excelBo.setAmountQ4(itemBudget.getBudgetAmount()); // excelBo.setAmountQ4(itemBudget.getBudgetAmount());
}else if (itemBudget.getItemName().equals("Y")){ // }else if (itemBudget.getItemName().equals("Y")){
excelBo.setAmountYear(itemBudget.getBudgetAmount()); // excelBo.setAmountYear(itemBudget.getBudgetAmount());
} // }
} // }
} // }
return excelBo; // return excelBo;
}).collect(Collectors.toList()); // }).collect(Collectors.toList());
} // }
private List<String> getConditionNames(List<TbsBudgetCondition> conditions){ private List<String> getConditionNames(List<TbsBudgetCondition> conditions){
if(CollectionUtil.isNotEmpty(conditions)){ if(CollectionUtil.isNotEmpty(conditions)){
@ -471,101 +471,101 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
return budgetConditions; return budgetConditions;
} }
@Override // @Override
@Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public void modifyByExcel(TbsBudgetExcelBo budgetBo) { // public void modifyByExcel(TbsBudgetExcelBo budgetBo) {
TbsBudget budget = this.getByCode(budgetBo.getBudgetCode()); // TbsBudget budget = this.getByCode(budgetBo.getBudgetCode());
if(budget!=null){ // if(budget!=null){
if(budget.getBudgetState().equals(1)){ // if(budget.getBudgetState().equals(1)){
Assert.throwEx("已开启的预算无法编辑"); // Assert.throwEx("已开启的预算无法编辑");
} // }
}else { // }else {
budget = new TbsBudget(); // budget = new TbsBudget();
budget.setBudgetCode(budgetBo.getBudgetCode()); // budget.setBudgetCode(budgetBo.getBudgetCode());
} // }
List<Long> skuIds = null; // List<Long> skuIds = null;
List<Long> spuIds = null; // List<Long> spuIds = null;
if(CollectionUtil.isNotEmpty(budgetBo.getSkuCodes())){ // if(CollectionUtil.isNotEmpty(budgetBo.getSkuCodes())){
List<GoodsSku> goodsSkus = goodsSkuService.getByCodes(budgetBo.getSkuCodes()); // List<GoodsSku> goodsSkus = goodsSkuService.getByCodes(budgetBo.getSkuCodes());
if(goodsSkus.size()!=budgetBo.getSkuCodes().size()){ // if(goodsSkus.size()!=budgetBo.getSkuCodes().size()){
Assert.throwEx("部分存货编码不存在"); // Assert.throwEx("部分存货编码不存在");
} // }
skuIds = goodsSkus.stream().map(GoodsSku::getId).collect(Collectors.toList()); // skuIds = goodsSkus.stream().map(GoodsSku::getId).collect(Collectors.toList());
} // }
if(CollectionUtil.isNotEmpty(budgetBo.getSpuNames())){ // if(CollectionUtil.isNotEmpty(budgetBo.getSpuNames())){
spuIds = new ArrayList<>(); // spuIds = new ArrayList<>();
for (String spuName : budgetBo.getSpuNames()) { // for (String spuName : budgetBo.getSpuNames()) {
GoodsSpu goodsSpu = goodsSpuService.getByName(spuName); // GoodsSpu goodsSpu = goodsSpuService.getByName(spuName);
if(goodsSpu==null){ // if(goodsSpu==null){
Assert.throwEx("["+spuName+"]单品不存在"); // Assert.throwEx("["+spuName+"]单品不存在");
} // }
spuIds.add(goodsSpu.getId()); // spuIds.add(goodsSpu.getId());
} // }
} // }
List<Long> brandIds = this.selectCategory(budgetBo.getBrandNames(),1); // List<Long> brandIds = this.selectCategory(budgetBo.getBrandNames(),1);
List<Long> categoryIds = this.selectCategory(budgetBo.getCategoryNames(),2); // List<Long> categoryIds = this.selectCategory(budgetBo.getCategoryNames(),2);
List<Long> seriesIds = this.selectCategory(budgetBo.getSeriesNames(),3); // List<Long> seriesIds = this.selectCategory(budgetBo.getSeriesNames(),3);
//
BmsSubject subject = subjectService.getByName(budgetBo.getSubjectName()); // BmsSubject subject = subjectService.getByName(budgetBo.getSubjectName());
TbsCenterDto centerDto = tbsCenterDtoService.getCenterDtoByName( // TbsCenterDto centerDto = tbsCenterDtoService.getCenterDtoByName(
budgetBo.getCenterType(), // budgetBo.getCenterType(),
budgetBo.getCenterName(), // budgetBo.getCenterName(),
budgetBo.getBudgetCode(), // budgetBo.getBudgetCode(),
null); // null);
TbsSchedule schedule = scheduleService.getByName(budgetBo.getScheduleName()); // TbsSchedule schedule = scheduleService.getByName(budgetBo.getScheduleName());
initEmptyBudget(budget,subject,centerDto,schedule); // initEmptyBudget(budget,subject,centerDto,schedule);
//保存 费用项 // //保存 费用项
List<TbsScheduleItem> scheduleItems = scheduleItemService.listByScheduleId(schedule.getId()); // List<TbsScheduleItem> scheduleItems = scheduleItemService.listByScheduleId(schedule.getId());
List<TbsScheduleItemBudget> scheduleItemBudgets = new ArrayList<>(); // List<TbsScheduleItemBudget> scheduleItemBudgets = new ArrayList<>();
for (TbsScheduleItem scheduleItem : scheduleItems) { // for (TbsScheduleItem scheduleItem : scheduleItems) {
TbsScheduleItemBudget itemBudget = CopierUtil.copy(scheduleItem,new TbsScheduleItemBudget()); // TbsScheduleItemBudget itemBudget = CopierUtil.copy(scheduleItem,new TbsScheduleItemBudget());
itemBudget.setId(null); // itemBudget.setId(null);
itemBudget.setScheduleItemId(scheduleItem.getId()); // itemBudget.setScheduleItemId(scheduleItem.getId());
itemBudget.setBudgetId(budget.getId()); // itemBudget.setBudgetId(budget.getId());
if(scheduleItem.getItemName().equals("M1")){ // if(scheduleItem.getItemName().equals("M1")){
itemBudget.setBudgetAmount(budgetBo.getAmountM1()); // itemBudget.setBudgetAmount(budgetBo.getAmountM1());
}else if (scheduleItem.getItemName().equals("M2")){ // }else if (scheduleItem.getItemName().equals("M2")){
itemBudget.setBudgetAmount(budgetBo.getAmountM2()); // itemBudget.setBudgetAmount(budgetBo.getAmountM2());
}else if (scheduleItem.getItemName().equals("M3")){ // }else if (scheduleItem.getItemName().equals("M3")){
itemBudget.setBudgetAmount(budgetBo.getAmountM3()); // itemBudget.setBudgetAmount(budgetBo.getAmountM3());
}else if (scheduleItem.getItemName().equals("M4")){ // }else if (scheduleItem.getItemName().equals("M4")){
itemBudget.setBudgetAmount(budgetBo.getAmountM4()); // itemBudget.setBudgetAmount(budgetBo.getAmountM4());
}else if (scheduleItem.getItemName().equals("M5")){ // }else if (scheduleItem.getItemName().equals("M5")){
itemBudget.setBudgetAmount(budgetBo.getAmountM5()); // itemBudget.setBudgetAmount(budgetBo.getAmountM5());
}else if (scheduleItem.getItemName().equals("M6")){ // }else if (scheduleItem.getItemName().equals("M6")){
itemBudget.setBudgetAmount(budgetBo.getAmountM6()); // itemBudget.setBudgetAmount(budgetBo.getAmountM6());
}else if (scheduleItem.getItemName().equals("M7")){ // }else if (scheduleItem.getItemName().equals("M7")){
itemBudget.setBudgetAmount(budgetBo.getAmountM7()); // itemBudget.setBudgetAmount(budgetBo.getAmountM7());
}else if (scheduleItem.getItemName().equals("M8")){ // }else if (scheduleItem.getItemName().equals("M8")){
itemBudget.setBudgetAmount(budgetBo.getAmountM8()); // itemBudget.setBudgetAmount(budgetBo.getAmountM8());
}else if (scheduleItem.getItemName().equals("M9")){ // }else if (scheduleItem.getItemName().equals("M9")){
itemBudget.setBudgetAmount(budgetBo.getAmountM9()); // itemBudget.setBudgetAmount(budgetBo.getAmountM9());
}else if (scheduleItem.getItemName().equals("M10")){ // }else if (scheduleItem.getItemName().equals("M10")){
itemBudget.setBudgetAmount(budgetBo.getAmountM10()); // itemBudget.setBudgetAmount(budgetBo.getAmountM10());
}else if (scheduleItem.getItemName().equals("M11")){ // }else if (scheduleItem.getItemName().equals("M11")){
itemBudget.setBudgetAmount(budgetBo.getAmountM11()); // itemBudget.setBudgetAmount(budgetBo.getAmountM11());
}else if (scheduleItem.getItemName().equals("M12")){ // }else if (scheduleItem.getItemName().equals("M12")){
itemBudget.setBudgetAmount(budgetBo.getAmountM12()); // itemBudget.setBudgetAmount(budgetBo.getAmountM12());
}else if (scheduleItem.getItemName().equals("Q1")){ // }else if (scheduleItem.getItemName().equals("Q1")){
itemBudget.setBudgetAmount(budgetBo.getAmountQ1()); // itemBudget.setBudgetAmount(budgetBo.getAmountQ1());
}else if (scheduleItem.getItemName().equals("Q2")){ // }else if (scheduleItem.getItemName().equals("Q2")){
itemBudget.setBudgetAmount(budgetBo.getAmountQ2()); // itemBudget.setBudgetAmount(budgetBo.getAmountQ2());
}else if (scheduleItem.getItemName().equals("Q3")){ // }else if (scheduleItem.getItemName().equals("Q3")){
itemBudget.setBudgetAmount(budgetBo.getAmountQ3()); // itemBudget.setBudgetAmount(budgetBo.getAmountQ3());
}else if (scheduleItem.getItemName().equals("Q4")){ // }else if (scheduleItem.getItemName().equals("Q4")){
itemBudget.setBudgetAmount(budgetBo.getAmountQ4()); // itemBudget.setBudgetAmount(budgetBo.getAmountQ4());
}else if (scheduleItem.getItemName().equals("Y")){ // }else if (scheduleItem.getItemName().equals("Y")){
itemBudget.setBudgetAmount(budgetBo.getAmountYear()); // itemBudget.setBudgetAmount(budgetBo.getAmountYear());
} // }
if(itemBudget.getBudgetAmount()==null){ // if(itemBudget.getBudgetAmount()==null){
itemBudget.setBudgetAmount(BigDecimal.ZERO); // itemBudget.setBudgetAmount(BigDecimal.ZERO);
} // }
scheduleItemBudgets.add(itemBudget); // scheduleItemBudgets.add(itemBudget);
} // }
scheduleItemBudgetService.saveBatch(scheduleItemBudgets); // scheduleItemBudgetService.saveBatch(scheduleItemBudgets);
//设置条件 // //设置条件
buildCondition(budget.getId(),brandIds,categoryIds,seriesIds,spuIds,skuIds); // buildCondition(budget.getId(),brandIds,categoryIds,seriesIds,spuIds,skuIds);
} // }
private List<Long> selectCategory(List<String> names,Integer level){ private List<Long> selectCategory(List<String> names,Integer level){
if(CollectionUtil.isNotEmpty(names)){ if(CollectionUtil.isNotEmpty(names)){

Write Preview
Loading…
Cancel
Save