Merge remote-tracking branch 'origin/featCnbg-supervFilter-20250325' into cnbg-master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -78,6 +78,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collector;
@@ -2362,7 +2363,9 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
 
         // 监督时间
         if (j == 13) {
-          datas[i][j] = formatter.format(wmTaskSupervision.getCreateTime().toLocalDate());
+            List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
+            Optional<WmTaskSupervisionAdvice> adv = supervisionAdvices.stream().filter(item -> item.getTaskSupervisionContent() == null).findFirst();
+            datas[i][j] = adv.isPresent() ? formatter.format(adv.get().getCreateTime().toLocalDate()) : "";
         }
       }
     }