From b17665b2645701d6eea22ab9d4662b76c97dd6e3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 09 十月 2025 16:17:26 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 66e6364..62f39a4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -174,7 +174,20 @@
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
if (CollectionUtils.isEmpty(list) || list.size() == 0) {
- return DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
+ ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
+ ObjectMapper objectMapper = new ObjectMapper();
+ try {
+ List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachform(), List.class);
+ serviceTaskVO.setPreachformList(mapList);
+
+ String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
+ serviceTaskVO.setPreachform(result);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+
+
+ return serviceTaskVO;
}
//灏嗘煡鍑烘潵鐨勬暟鎹�掑叆ServiceSubtaskVO涓�
@@ -262,8 +275,17 @@
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
serviceSubtaskPreachform.setSubid(serviceSubtask1.getId());
List<ServiceSubtaskPreachform> serviceSubtaskPreachformList = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- serviceTaskVO.setPreachformList(serviceSubtaskPreachformList);
+ List<Map<String, Object>> resultList = serviceSubtaskPreachformList.stream().map(item -> {
+ Map<String, Object> map = new HashMap<>();
+ map.put("sort", item.getSort());
+ map.put("preachform", item.getPreachform());
+ map.put("compensateTime", item.getCompensateTime());
+ return map;
+ }).collect(Collectors.toList());
+ serviceTaskVO.setPreachformList(resultList);
+ String result = resultList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
+ serviceTaskVO.setPreachform(result);
}
serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
@@ -594,8 +616,12 @@
//闇�瑕佹寜service_task閲岀殑preachform鐨勯『搴忓皢鍙戦�佹柟寮忎繚瀛樺埌service_subtask_preachform琛ㄤ腑
if (StringUtils.isNotEmpty(serviceTaskVO.getPreachformList())) {
- List<ServiceSubtaskPreachform> pfList = serviceTaskVO.getPreachformList();
- for (ServiceSubtaskPreachform serviceSubtaskPreachform : pfList) {
+ List<Map<String, Object>> pfList = serviceTaskVO.getPreachformList();
+ for (Map<String, Object> map : pfList) {
+ ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
+ serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
+ serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
+ serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
//杩欎釜sendstate闇�瑕佸湪鏁版嵁搴撹缃竴涓粯璁ゅ�间负鈥�1鈥�
@@ -818,8 +844,12 @@
ServiceSubtask serviceSubtask = ssTaskList.get(i);
serviceSubtaskPreachformMapper.deleteServiceSubtaskPreachformBySubid(serviceSubtask.getId());
if (StringUtils.isNotEmpty(serviceTaskVO.getPreachformList())) {
- List<ServiceSubtaskPreachform> pfList = serviceTaskVO.getPreachformList();
- for (ServiceSubtaskPreachform serviceSubtaskPreachform : pfList) {
+ List<Map<String, Object>> pfList = serviceTaskVO.getPreachformList();
+ for (Map<String, Object> map : pfList) {
+ ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
+ serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
+ serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
+ serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
//杩欎釜sendstate闇�瑕佸湪鏁版嵁搴撹缃竴涓粯璁ゅ�间负鈥�1鈥�
--
Gitblit v1.9.3