From fc4fb24b367f6f0da53a7116dc192868c70f72f3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 20 三月 2026 17:54:09 +0800
Subject: [PATCH] 【丽水】新增ServiceTask新增四级手术等级代码
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 7117122..85f2ff7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -593,6 +593,7 @@
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+ serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
@@ -821,31 +822,32 @@
}
// serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+ serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
- String[] opcodes = serviceTaskVO.getOpcode().split(",");
- for (String opcode : opcodes) {
- //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
- ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
- serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
- serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
-
- serviceTaskoper.setOpcode(opcode);
- log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
- serviceTaskoper.setId(serviceTaskopers.get(0).getId());
- serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
- } else {
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
- }
- }
- }
+// if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+// String[] opcodes = serviceTaskVO.getOpcode().split(",");
+// for (String opcode : opcodes) {
+// //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+// ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
+// serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
+// serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
+// List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
+//
+// serviceTaskoper.setOpcode(opcode);
+// log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+// if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+// serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+// serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+// } else {
+// serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+// }
+// }
+// }
}
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -3167,7 +3169,7 @@
* @return
*/
@Override
- @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -3522,7 +3524,7 @@
diagname.setSuggest(subtask.getSuggest());
diagname.setOperator(subtask.getOperator());
diagname.setFinishtime(subtask.getFinishtime());
- diagname.setLongSendTime(subtask.getLongSendTime());
+ diagname.setVisitTime(subtask.getVisitTime());
diagname.setEndtime(subtask.getEndtime());
//璁＄畻鍑洪櫌澶╂暟
if (!Objects.isNull(diagname.getEndtime())) {
--
Gitblit v1.9.3