From 580f358ce4e50816211d69ff6e31817b6593d731 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 十月 2024 17:32:50 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 3e4d7dc..e117cc3 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
@@ -67,9 +67,11 @@
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
- ServiceSubtaskVO ServiceTaskcall = new ServiceSubtaskVO();
- ServiceTaskcall.setTaskid(ServiceTaskVO.getTaskid());
- List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(ServiceTaskcall);
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
+ serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
+ serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
+ List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
//宸插彂閫�
long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
@@ -186,7 +188,7 @@
}
log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true));
}
}
--
Gitblit v1.9.3