lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into lcj

Browse Source
This commit is contained in:
罗成
2025-08-23 09:01:23 +08:00
parent 2fda6c8930 5cecdaf385
commit 3f6af11dff
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java
View File

@ -210,8 +210,14 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
.eq(OutMonthPlan::getProjectId, outMonthPlan.getProjectId())
.eq(OutMonthPlan::getPlanMonth, outMonthPlan.getPlanMonth())
);
Set<String> collect = outMonthPlans.stream().map(OutMonthPlan::getValueType).collect(Collectors.toSet());
return collect.contains("1") && collect.contains("2") && collect.contains("3");
Set<String> collectA = outMonthPlans.stream().filter(vo -> "1".equals(vo.getType()))
.map(OutMonthPlan::getValueType).collect(Collectors.toSet());
Set<String> collectB = outMonthPlans.stream().filter(vo -> "2".equals(vo.getType()))
.map(OutMonthPlan::getValueType).collect(Collectors.toSet());
return (collectA.contains("1") && collectA.contains("2") && collectA.contains("3"))
&& (collectB.contains("1") && collectB.contains("2") && collectB.contains("3"));
}
@Override