|
@@ -131,7 +131,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
int yearSum=1;
|
|
int yearSum=1;
|
|
|
for (TOrderTaskBo e : collect) {
|
|
for (TOrderTaskBo e : collect) {
|
|
|
- if (e.getYearSum()>yearSum){
|
|
|
|
|
|
|
+ if (e.getYearSum()!=null&&e.getYearSum()>yearSum){
|
|
|
yearSum=e.getYearSum();
|
|
yearSum=e.getYearSum();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|