|
|
@@ -45,6 +45,7 @@ public class OrderPlusServiceImpl extends BaseMybatisDao<TOrderNewMapper> implem
|
|
|
String serviceLife = null;
|
|
|
List<String> list=new ArrayList<>();
|
|
|
int yearSum=0;
|
|
|
+ List<String> taskList=new ArrayList<>();
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
|
|
|
for (TOrderTaskBo e : collect) {
|
|
|
if (e.getYearSum()>yearSum){
|
|
|
@@ -56,16 +57,15 @@ public class OrderPlusServiceImpl extends BaseMybatisDao<TOrderNewMapper> implem
|
|
|
list = JSON.parseArray(serviceLife, String.class);
|
|
|
}
|
|
|
List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
- List<String> list2=new ArrayList<>();
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
for (String s : list) {
|
|
|
if (s.equals(e.getServiceYear())){
|
|
|
s=s+" (已派)";
|
|
|
}
|
|
|
- list2.add(s);
|
|
|
+ taskList.add(s);
|
|
|
}
|
|
|
}
|
|
|
- System.out.println(list2);
|
|
|
+ System.out.println(taskList);
|
|
|
}
|
|
|
return null;
|
|
|
}
|