From 521959e291147717c8b0258dbf6a076e4b04d8cd Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 14 七月 2026 15:56:06 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index a2fca4a..801edca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -71,38 +71,38 @@
// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
List<ServiceTask> list = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
List<ServiceTaskVO> serviceTaskVOS = DtoConversionUtils.sourceToTarget(list, ServiceTaskVO.class);
-//
-// List<Long> taskIds = list.stream().map(ServiceTask::getTaskid).collect(Collectors.toList());
-//
-// ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
-// serviceSubtaskEntity.setTaskIds(taskIds);
-// serviceSubtaskEntity.setStartOutHospTime(serviceTask.getStartOutHospTime());
-// serviceSubtaskEntity.setEndOutHospTime(serviceTask.getEndOutHospTime());
-// // 鎵归噺鏌ヨ鎵�鏈夊瓙浠诲姟
-// Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
-// .selectServiceSubtaskList(serviceSubtaskEntity)
-// .stream()
-// .filter(subtask -> subtask.getTaskid() != null) // 娣诲姞杩囨护
-// .collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));
+
+ List<Long> taskIds = list.stream().map(ServiceTask::getTaskid).collect(Collectors.toList());
+
+ ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
+ serviceSubtaskEntity.setTaskIds(taskIds);
+ serviceSubtaskEntity.setStartOutHospTime(serviceTask.getStartOutHospTime());
+ serviceSubtaskEntity.setEndOutHospTime(serviceTask.getEndOutHospTime());
+ // 鎵归噺鏌ヨ鎵�鏈夊瓙浠诲姟
+ Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
+ .selectServiceSubtaskList(serviceSubtaskEntity)
+ .stream()
+ .filter(subtask -> subtask.getTaskid() != null) // 娣诲姞杩囨护
+ .collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
-// for (ServiceTaskVO taskVO : serviceTaskVOS) {
-// List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid().toString(), Collections.emptyList());
-//
-// if (CollectionUtils.isNotEmpty(subtasks)) {
-// //宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
-// long yfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
-// (s.getSendstate() >= 3L || s.getSendstate() == 1L)).count();
-// //鏈彂閫�
-// long wfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
-// s.getSendstate() == 2L).count();
-// taskVO.setYfs(yfs);
-// taskVO.setWfs(wfs);
-//
-// }
-//
-// }
+ for (ServiceTaskVO taskVO : serviceTaskVOS) {
+ List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid().toString(), Collections.emptyList());
+
+ if (CollectionUtils.isNotEmpty(subtasks)) {
+ //宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
+ long yfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
+ (s.getSendstate() >= 3L || s.getSendstate() == 1L)).count();
+ //鏈彂閫�
+ long wfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
+ s.getSendstate() == 2L).count();
+ taskVO.setYfs(yfs);
+ taskVO.setWfs(wfs);
+
+ }
+
+ }
//鑾峰彇total
long total = PageUtils.count(new ISelect() {
@Override
--
Gitblit v1.9.3