From 4613099dca2d4e1c7b46a69a98bb4c210312ac57 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 16 四月 2025 11:15:37 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 73fdfa3..3ad858d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -37,7 +38,7 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
- private IvrTaskTemplateMapper ivrTaskTemplateMapper;
+ private ServiceTaskdeptMapper serviceTaskdeptMapper;
@Autowired
private PatArchiveImportMapper patArchiveImportMapper;
@@ -154,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);
@@ -200,10 +221,13 @@
ServiceSubtask ss = new ServiceSubtask();
ss.setTaskid(taskid);
ss.setPatid(patid);
- ss.setSendstate(1L);
- ss.setResult("success");
- ss.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
+ if (integer != null && integer != 6) {
+ ss.setSendstate(1L);
+ ss.setResult("success");
+ ss.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ }
}
}
@@ -300,9 +324,9 @@
serviceSubtaskVO.setPatid(patid);
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList) && serviceSubtaskList.size() == 1) {
- if (serviceSubtaskList.get(0).getSendstate() != 6 && isFinish == true) {
+ if (serviceSubtaskList.get(0).getSendstate() == 3 && isFinish == true) {
ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setSendstate(7L);
+ serviceSubtask.setSendstate(1L);
serviceSubtask.setPatid(patid);
serviceSubtask.setTaskid(serviceTask.getTaskid());
serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
@@ -353,7 +377,7 @@
}
//鏇挎崲鎮ｈ�呬釜浜轰俊鎭暟鎹�
log.error("闂id锛歿}, 闂鍐呭锛歿}", svyLibTemplateScriptVO.getId(), svyLibTemplateScriptVO.getScriptContent());
- if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent())) {
+ if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent()) && ObjectUtils.isNotEmpty(patArchive)) {
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
@@ -374,9 +398,13 @@
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(taskid);
serviceSubtask.setPatid(patid);
- serviceSubtask.setResult("瀹屾垚");
- serviceSubtask.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
+ if (integer == 3) {
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setSendstate(6L);
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ }
}
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
--
Gitblit v1.9.3