From 2d1db09ab80b4f164ca9dd66b18d0992203fa417 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:43:39 +0800
Subject: [PATCH] 新增Orgid
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 fb24dc7..bbf8ff8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1,7 +1,6 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -24,7 +23,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.Duration;
@@ -177,15 +175,14 @@
ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
ObjectMapper objectMapper = new ObjectMapper();
try {
- List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachform(), List.class);
+ List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
serviceTaskVO.setPreachformList(mapList);
-
- String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
- serviceTaskVO.setPreachform(result);
+//
+// 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;
}
@@ -453,7 +450,7 @@
ObjectMapper mapper = new ObjectMapper();
try {
String preachformList = mapper.writeValueAsString(serviceTaskVO.getPreachformList());
- serviceTask.setPreachform(preachformList);
+ serviceTask.setPreachformDesc(preachformList);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
@@ -849,7 +846,7 @@
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.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("compensateTime").toString());
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
//杩欎釜sendstate闇�瑕佸湪鏁版嵁搴撹缃竴涓粯璁ゅ�间负鈥�1鈥�
@@ -2304,22 +2301,22 @@
}
}
//闅忚鎯呭喌
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==1) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
}
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==2) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
}
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==3) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
}
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==4) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
}
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==5) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
}
- if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==6) {
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
}
}
--
Gitblit v1.9.3