From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 861dcbb..774987e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -40,6 +40,9 @@
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
+ private SvyTaskTemplateMapper svyTaskTemplateMapper;
+
+ @Autowired
private PatArchiveMapper patArchiveMapper;
@Autowired
@@ -136,7 +139,7 @@
}
@Override
- public List getScriptInfoByCondition(Long taskid, Long patid) {
+ public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
List info = new ArrayList();
@@ -148,7 +151,7 @@
info = wjInfo(serviceTask, patid);
} else {
//瀹ｆ暀
- info = xjInfo(serviceTask.getTemplateid());
+ info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()));
}
//鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
@@ -158,8 +161,14 @@
ServiceTaskSingle.setResult("success");
ServiceTaskSingle.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
+ SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
+ Map<String, Object> map = new HashMap<>();
+ map.put("script", info);
+ map.put("revisitAfter", svyTaskTemplate.getConclusion());
+ map.put("type", serviceTask.getType());
+ map.put("taskName",serviceTask.getTaskName());
- return info;
+ return map;
}
/**
@@ -232,7 +241,7 @@
private List wjInfo(ServiceTask serviceTask, Long patid) {
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
- svyLibTemplateScript.setId(Long.valueOf(serviceTask.getTemplateid()));
+ svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
svyLibTemplateScript.setDelFlag("0");
List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
if (CollectionUtils.isEmpty(svyLibTemplateScripts) || svyLibTemplateScripts.size() == 0) {
--
Gitblit v1.9.3