|
@@ -2245,14 +2245,15 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
|
|
}
|
|
}
|
|
|
|
|
|
WmTaskSupervision wmTaskSupervision = taskSupervisions.get(i - 2);
|
|
WmTaskSupervision wmTaskSupervision = taskSupervisions.get(i - 2);
|
|
|
|
+
|
|
|
|
+ boolean rejectedByLeader =
|
|
|
|
+ advices.get(wmTaskSupervision.getSupervisionId())
|
|
|
|
+ .stream().filter(adv -> adv.getTaskSupervisionContent() != null && !adv.getAdviceResult())
|
|
|
|
+ .findFirst().isPresent();
|
|
|
|
+
|
|
// 列的长度每次都变化。每次都要重新申请空间(长度)
|
|
// 列的长度每次都变化。每次都要重新申请空间(长度)
|
|
for (int j = 0; j < datas[i].length; j++) {
|
|
for (int j = 0; j < datas[i].length; j++) {
|
|
|
|
|
|
- boolean rejectedByLeader =
|
|
|
|
- advices.get(wmTaskSupervision.getSupervisionId())
|
|
|
|
- .stream().filter(adv -> adv.getTaskSupervisionContent() != null && !adv.getAdviceResult())
|
|
|
|
- .findFirst().isPresent();
|
|
|
|
-
|
|
|
|
// 服务ID
|
|
// 服务ID
|
|
if (j == 0) {
|
|
if (j == 0) {
|
|
datas[i][j] = wmTaskSupervision.getTaskId().toString();
|
|
datas[i][j] = wmTaskSupervision.getTaskId().toString();
|
|
@@ -2480,7 +2481,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
|
|
// idx++;
|
|
// idx++;
|
|
// }
|
|
// }
|
|
|
|
|
|
- return datas;
|
|
|
|
|
|
+ return Arrays.stream(datas).filter(data -> StrUtil.isNotEmpty(data[13].toString())).toArray(Object[][]::new);
|
|
}
|
|
}
|
|
|
|
|
|
// @Transactional(rollbackFor = Exception.class)
|
|
// @Transactional(rollbackFor = Exception.class)
|