|
|
@@ -331,7 +331,7 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
|
|
|
// 获取当前报表的计算方式 [1]+[2]类型
|
|
|
String calcFormula = costDepartmentProfitVO.getCalcFormula();
|
|
|
String responsibilityCode = costDepartmentProfitVO.getResponsibilityCode();
|
|
|
- String replace = calcFormula.replace("[", "").replace("]", "").replace("+", ",");
|
|
|
+ String replace = calcFormula.replace("[", "").replace("]", "").replace("+", ",").replace("-",",");
|
|
|
List<Integer> calcFormulaList = Arrays.stream(replace.split(StrUtil.COMMA)).map(Integer::valueOf).collect(Collectors.toList());
|
|
|
// 查询这个编号集合的报表
|
|
|
List<Long> reportIdList = costDepartmentProfitVOList.stream().filter(i -> i.getResponsibilityCode().equals(responsibilityCode) && calcFormulaList.contains(i.getReportNum())).map(CostDepartmentProfitVO::getReportParentId).collect(Collectors.toList());
|
