From babb070a354a8ecf1473ff882e0dc8735ab59912 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期二, 10 六月 2025 15:37:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index 9192e8f..d560ef9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -38,7 +38,7 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
- private IvrTaskTemplateMapper ivrTaskTemplateMapper;
+ private ServiceTaskdeptMapper serviceTaskdeptMapper;
@Autowired
private PatArchiveImportMapper patArchiveImportMapper;
@@ -155,12 +155,32 @@
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean deleteServiceTaskByTaskid(Long taskid) {
- ServiceSubtask ServiceTaskcall = new ServiceSubtask();
- ServiceTaskcall.setTaskid(taskid);
- ServiceTaskcall.setDelFlag("1");
- Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(ServiceTaskcall);
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(taskid);
+
+ //鏌ヨ瀛愪换鍔�
+ ServiceSubtaskVO serviceSubtaskVO = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskVO.class);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ for (ServiceSubtask ss : serviceSubtaskList) {
+ log.error("sfSend闇�瑕佺Щ闄ょ殑subId涓猴細{}", ss.getId().toString());
+ redisCache.removeElementFromList("cache-exist", ss.getId().toString());
+ redisCache.removeElementFromList("cache-0", ss.getId().toString());
+ redisCache.removeElementFromList("cache-1", ss.getId().toString());
+ redisCache.removeElementFromList("cache-2", ss.getId().toString());
+ redisCache.removeElementFromList("cache-3", ss.getId().toString());
+ redisCache.removeElementFromList("cache-4", ss.getId().toString());
+ }
+
+ serviceSubtask.setDelFlag("1");
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
+
+ //鍏宠仈琛ㄥ垹闄�
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setTaskId(taskid);
+ int i = serviceTaskdeptMapper.deleteServiceTaskdeptByTaskId(serviceTaskdept);
+
Boolean isSuccess = false;
- if (!aBoolean) {
+ if (!aBoolean || i <= 0) {
new BaseException("浠诲姟鍒犻櫎澶辫触");
}
isSuccess = serviceTaskMapper.deleteServiceTaskByTaskid(taskid);
@@ -204,8 +224,8 @@
Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
if (integer != null && integer != 6) {
ss.setSendstate(1L);
- ss.setResult("success");
- ss.setFinishtime(new Date());
+// ss.setResult("success");
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
}
}
@@ -218,7 +238,6 @@
map.put("type", serviceTask.getType());
map.put("taskName", serviceTask.getTaskName());
map.put("submit", "0");
-
return map;
}
--
Gitblit v1.9.3