From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java | 9 +++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 5 +++--
smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java | 20 ++++++++++++++++++++
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 2 +-
smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java | 2 ++
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 1 +
6 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
index a1a97a1..5c61a8a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
@@ -64,6 +64,15 @@
public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrTaskTemplateService.selectIvrTaskTemplateByID(ID));
}
+ /**
+ * 鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�
+ */
+ //@PreAuthorize("@ss.hasPermi('system:template:query')")
+ @ApiOperation("鑾峰彇璇煶浠诲姟妯℃澘搴撹缁嗕俊鎭�(鍖呭惈妯℃澘闂)")
+ @GetMapping(value = "/getTemplateInfoByID/{ID}")
+ public AjaxResult selectIvrTaskTemplateInfoByID(@PathVariable("ID") Long ID) {
+ return success(ivrTaskTemplateService.selectIvrTaskTemplateInfoByID(ID));
+ }
/**
* 鏂板闅忚浠诲姟闅忚妯℃澘搴�
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 9a406dd..bda0f4c 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -32,7 +32,7 @@
* pageSize
*/
@ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫笉鏄� 1锛氭槸")
- private Integer longTask;
+ private Integer longTask = 0;
/**
*
diff --git a/smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java b/smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java
index 48d721b..681eb62 100644
--- a/smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java
+++ b/smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java
@@ -20,6 +20,8 @@
*/
public IvrTaskTemplate selectIvrTaskTemplateByID(Long ID);
+ public IvrTaskTemplateVO selectIvrTaskTemplateInfoByID(Long ID);
+
/**
* 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
index 197a1aa..09db01e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
@@ -55,6 +55,26 @@
return ivrTaskTemplateMapper.selectIvrTaskTemplateByID(ID);
}
+ @Override
+ public IvrTaskTemplateVO selectIvrTaskTemplateInfoByID(Long ID) {
+ IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateMapper.selectIvrTaskTemplateByID(ID);
+ IvrTaskTemplateVO ivrTaskTemplateVO = DtoConversionUtils.sourceToTarget(ivrTaskTemplate, IvrTaskTemplateVO.class);
+ IvrTaskTemplateScript ivrTaskTemplateScript = new IvrTaskTemplateScript();
+ ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getId());
+ List<IvrTaskTemplateScript> ivrTaskTemplateScripts = ivrTaskTemplateScriptMapper.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript);
+ List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScripts, IvrTaskTemplateScriptVO.class);
+ for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOS) {
+ IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption=new IvrTaskTemplateTargetoption();
+ ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScriptVO.getScriptID());
+ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateTargetoptionMapper.selectIvrTaskTemplateTargetoptionList(ivrTaskTemplateTargetoption);
+ ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
+ }
+ ivrTaskTemplateVO.setIvrTaskTemplateScriptVOList(ivrTaskTemplateScriptVOS);
+
+
+ return ivrTaskTemplateVO;
+ }
+
/**
* 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*
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 95702bb..e6c1691 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -376,7 +376,8 @@
serviceSubtask.setPatid(patTaskRelevance.getPatid());
serviceSubtask.setCreateTime(DateUtils.getNowDate());
serviceSubtask.setSendstate(1L);
- if (serviceTaskVO.getLongTask() == 1) serviceSubtask.setSendstate(2L);
+ if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1)
+ serviceSubtask.setSendstate(2L);
serviceSubtask.setDeptcode(patTaskRelevance.getDeptCode());
serviceSubtask.setDeptname(patTaskRelevance.getDeptName());
serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
@@ -390,7 +391,7 @@
serviceSubtask.setEndtime(patTaskRelevance.getEndtime());
serviceSubtask.setNurseId(patTaskRelevance.getNurseId());
serviceSubtask.setNurseName(patTaskRelevance.getNurseName());
- if (serviceTaskVO.getLongTask() == 1)
+ if (serviceTaskVO.getLongTask() != null &&serviceTaskVO.getLongTask() == 1)
serviceSubtask.setLongSendTime(patTaskRelevance.getLongSendTime());
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
integer = serviceSubtask.getId().intValue();
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index 912252f..0e7e43b 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -79,6 +79,7 @@
resultMap="IvrTaskTemplateScriptResult">
<include refid="selectIvrTaskTemplateScriptVo"/>
<where>
+ del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="score != null ">and score = #{score}</if>
<if test="ivrtext != null ">and ivrtext = #{ivrtext}</if>
--
Gitblit v1.9.3