|
@@ -556,6 +556,13 @@ public class MaterialProgressController extends BladeController {
|
|
|
AtomicInteger await = new AtomicInteger();
|
|
|
//已审批
|
|
|
AtomicInteger approval = new AtomicInteger();
|
|
|
+ if (list != null && !list.isEmpty()) {
|
|
|
+ Map<Long, InformationQuery> map = list.stream().collect(Collectors.toMap(InformationQuery::getWbsId, item -> item, (v1, v2) -> v1.getId() > v2.getId() ? v1 : v2));
|
|
|
+ list = new ArrayList<>(map.values());
|
|
|
+ }
|
|
|
+ if (list == null) {
|
|
|
+ list = new ArrayList<>();
|
|
|
+ }
|
|
|
list.forEach(vo -> {
|
|
|
switch (vo.getStatus()) {
|
|
|
case 1:
|