From c309ec6868bf937529e8e3ff948dbdedd66e5631 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 27 三月 2026 15:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 2b4aaac..11998d6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -205,6 +205,15 @@
try {
List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
serviceTaskVO.setPreachformList(mapList);
+ if(ObjectUtils.isNotEmpty(serviceTask.getTaskid())){
+ ServiceTaskoper operVo = new ServiceTaskoper();
+ operVo.setTaskId(serviceTask.getTaskid());
+ operVo.setOrgid(serviceTask.getOrgid());
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(operVo);
+ if(ObjectUtils.isNotEmpty(serviceTaskopers)){
+ serviceTaskVO.setOplevelcode(serviceTaskopers.get(0).getOplevelcode());
+ }
+ }
//
// String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
// serviceTaskVO.setPreachform(result);
@@ -222,6 +231,15 @@
serviceTaskVO.setShowTimeNoon(serviceTask.getShowTimeNoon());
serviceTaskVO.setShowTimeNight(serviceTask.getShowTimeNight());
serviceTaskVO.setPreachform(serviceTask.getPreachform());
+ if(ObjectUtils.isNotEmpty(serviceTask.getTaskid())){
+ ServiceTaskoper operVo = new ServiceTaskoper();
+ operVo.setTaskId(serviceTask.getTaskid());
+ operVo.setOrgid(serviceTask.getOrgid());
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(operVo);
+ if(ObjectUtils.isNotEmpty(serviceTaskopers)){
+ serviceTaskVO.setOplevelcode(serviceTaskopers.get(0).getOplevelcode());
+ }
+ }
String sendTimeSlot = serviceTask.getSendTimeSlot();
ObjectMapper objectMapper = new ObjectMapper();
try {
@@ -309,7 +327,6 @@
// String result = resultList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
// serviceTaskVO.setPreachform(result);
}
-
serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
return serviceTaskVO;
}
--
Gitblit v1.9.3