From 459aa78c84cf552ebea6ef056d978c2531d71ac8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 三月 2026 17:14:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 94d81fc..4d2a0c8 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
@@ -73,13 +74,13 @@
List<Long> taskIds = list.stream().map(ServiceTask::getTaskid).collect(Collectors.toList());
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskIds(taskIds);
- serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
- serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
+ ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
+ serviceSubtaskEntity.setTaskIds(taskIds);
+ serviceSubtaskEntity.setStartOutHospTime(serviceTask.getStartOutHospTime());
+ serviceSubtaskEntity.setEndOutHospTime(serviceTask.getEndOutHospTime());
// 鎵归噺鏌ヨ鎵�鏈夊瓙浠诲姟
Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
- .selectServiceSubtaskList(serviceSubtaskVO)
+ .selectServiceSubtaskList(serviceSubtaskEntity)
.stream()
.filter(subtask -> subtask.getTaskid() != null) // 娣诲姞杩囨护
.collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));
--
Gitblit v1.9.3