From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 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 8329426..baf4338 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -34,6 +34,15 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
+ private IvrTaskTemplateMapper ivrTaskTemplateMapper;
+
+ @Autowired
+ private SvyTaskTemplateMapper svyTaskTemplateMapper;
+
+ @Autowired
+ private HeLibraryMapper heLibraryMapper;
+
+ @Autowired
private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;
@Autowired
@@ -41,9 +50,6 @@
@Autowired
private PatArchiveMapper patArchiveMapper;
-
- @Autowired
- private HeLibraryMapper heLibraryMapper;
@Autowired
@@ -87,6 +93,7 @@
@Override
public int insertServiceTask(ServiceTask serviceTask) {
serviceTask.setCreateTime(DateUtils.getNowDate());
+ serviceTask.setUpdateTime(DateUtils.getNowDate());
return serviceTaskMapper.insertServiceTask(serviceTask);
}
@@ -135,7 +142,20 @@
}
@Override
- public List getScriptInfoByCondition(Long taskid, Long patid) {
+ public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+ Map<String, Object> map = new HashMap<>();
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setPatid(patid);
+ serviceSubtaskVO.setTaskid(taskid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ //鏌ヨ鎮ｈ�呮槸鍚﹂噸瑕嗗仛棰�
+ if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
+ Long submit = selectServiceSubtaskList.get(0).getSubmit();
+ if (submit == 1L) {
+ map.put("submit", "1");
+ return map;
+ }
+ }
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
List info = new ArrayList();
@@ -147,7 +167,7 @@
info = wjInfo(serviceTask, patid);
} else {
//瀹ｆ暀
- info = xjInfo(serviceTask.getTemplateid());
+ info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
}
//鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
@@ -157,8 +177,15 @@
ServiceTaskSingle.setResult("success");
ServiceTaskSingle.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
+ SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
+ if (StringUtils.isNotEmpty(serviceTask.getKcb())) map.put("kcb", serviceTask.getKcb());
+ map.put("script", info);
+ if (StringUtils.isNotEmpty(serviceTask.getJsy())) map.put("jsy", serviceTask.getJsy());
+ map.put("type", serviceTask.getType());
+ map.put("taskName", serviceTask.getTaskName());
+ map.put("submit", "0");
- return info;
+ return map;
}
/**
@@ -171,7 +198,7 @@
public List sfInfo(ServiceTask serviceTask, Long patid) {
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
IvrLibaTemplateScript ivrLibaTemplateScript = new IvrLibaTemplateScript();
- ivrLibaTemplateScript.setTemplateID(serviceTask.getTemplateid());
+ ivrLibaTemplateScript.setTemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
ivrLibaTemplateScript.setDelFlag("0");
List<IvrLibaTemplateScript> ivrLibaTemplateScripts = ivrLibaTemplateScriptMapper.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
if (CollectionUtils.isEmpty(ivrLibaTemplateScripts) || ivrLibaTemplateScripts.size() == 0) {
@@ -199,25 +226,27 @@
//灏嗘ā鏉块棶棰樿瘽鏈噷鐨勯�氶厤绗︽浛鎹�
for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOS) {
- if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptConten())) {
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptContent())) {
for (Map<String, String> map : mapList) {
for (String key : map.keySet()) {
- ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
+ ivrLibaTemplateScriptVO.setScriptContent(ivrLibaTemplateScriptVO.getScriptContent().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
}
}
//鏇挎崲鎮ｈ�呬釜浜轰俊鎭暟鎹�
- ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
- ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
- ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
+ ivrLibaTemplateScriptVO.setScriptContent(ivrLibaTemplateScriptVO.getScriptContent().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
+ ivrLibaTemplateScriptVO.setScriptContent(ivrLibaTemplateScriptVO.getScriptContent().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
+ ivrLibaTemplateScriptVO.setScriptContent(ivrLibaTemplateScriptVO.getScriptContent().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
//鑾峰彇闂閫夐」
IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
- ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getID());
+ ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getId());
List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptions = ivrLibaTemplateTargetOptionMapper.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
ivrLibaTemplateScriptVO.setIvrLibaScriptTargetoptionList(ivrLibaTemplateTargetoptions);
}
}
+ Collections.sort(ivrLibaTemplateScriptVOS, Comparator.comparingInt(IvrLibaTemplateScriptVO::getSort));
+
return ivrLibaTemplateScriptVOS;
}
@@ -231,7 +260,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) {
@@ -267,10 +296,12 @@
}
}
//鏇挎崲鎮ｈ�呬釜浜轰俊鎭暟鎹�
- 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() : ""));
-
+ log.error("闂id锛歿}, 闂鍐呭锛歿}", svyLibTemplateScriptVO.getId(), svyLibTemplateScriptVO.getScriptContent());
+ if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent())) {
+ 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() : ""));
+ }
//鑾峰彇闂閫夐」
SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption();
svyLibTemplateTargetoption.setScriptid(svyLibTemplateScriptVO.getId());
@@ -278,10 +309,17 @@
svyLibTemplateScriptVO.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
}
}
+ Collections.sort(svyLibTemplateScriptVOS, Comparator.comparingLong(SvyLibTemplateScriptVO::getSort));
return svyLibTemplateScriptVOS;
}
- private List xjInfo(Long templateId) {
+ private List xjInfo(Long templateId, Long taskid, Long patid) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(taskid);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
list.add(heLibrary);
--
Gitblit v1.9.3