|
@ -22,6 +22,7 @@ import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; |
|
|
import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; |
|
|
import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; |
|
|
import lombok.AllArgsConstructor; |
|
|
import lombok.AllArgsConstructor; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
|
import org.jetbrains.annotations.NotNull; |
|
|
import org.jetbrains.annotations.NotNull; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
@ -201,6 +202,17 @@ public class TbsBudgetApplicationService { |
|
|
List<TbsScheduleItemBudget> scheduleItemList = this.loadScheduleBudgetAndSetting(activityList, budgetIds, noBudgetActivityIds,costSortWrapper); |
|
|
List<TbsScheduleItemBudget> scheduleItemList = this.loadScheduleBudgetAndSetting(activityList, budgetIds, noBudgetActivityIds,costSortWrapper); |
|
|
List<String> centerIds = activityCenterList.stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList()); |
|
|
List<String> centerIds = activityCenterList.stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList()); |
|
|
List<Long> subjectIds = activitySubjects.stream().map(TbsActivitySubject::getSubjectId).collect(Collectors.toList()); |
|
|
List<Long> subjectIds = activitySubjects.stream().map(TbsActivitySubject::getSubjectId).collect(Collectors.toList()); |
|
|
|
|
|
//通过模板限制,选中指定的预算
|
|
|
|
|
|
List<Long> limitBudgetIds = new ArrayList<>(); |
|
|
|
|
|
for (TbsActivity activity : activityList) { |
|
|
|
|
|
if(StringUtils.hasText(activity.getTemplateBudgetIds())){ |
|
|
|
|
|
List<Long> budgetIdsList = Arrays.stream(activity.getTemplateBudgetIds().split(",")).map(Long::parseLong) |
|
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
limitBudgetIds.addAll(budgetIdsList); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
// budgetIds交集
|
|
|
|
|
|
budgetIds = (List<Long>) CollectionUtils.intersection(budgetIds, limitBudgetIds); |
|
|
// 加载所有条件
|
|
|
// 加载所有条件
|
|
|
List<TbsBudget> budgetList; |
|
|
List<TbsBudget> budgetList; |
|
|
if(budgetIds.size()>0){ |
|
|
if(budgetIds.size()>0){ |
|
|