From 57e82dd493a25e887894afef2f0e0223f1e546bd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 02 十二月 2024 17:59:45 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java | 22 ++++++++++++++++++++--
smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java | 7 +++++++
ruoyi-admin/src/main/resources/application.yml | 2 +-
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 13 +++++++++----
4 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index be3e019..c718234 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -133,7 +133,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
index 2cdb6f2..f684fd2 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
@@ -44,6 +44,13 @@
private BigDecimal score;
/**
+ * 鏍囬
+ */
+ @Excel(name = "鏍囬")
+ @ApiModelProperty(value = "鏍囬")
+ private String scriptTopic;
+
+ /**
* 缁勫埆
*/
@Excel(name = "缁勫埆")
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 09db01e..34966d0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
@@ -64,9 +64,27 @@
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());
+ IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption = new IvrTaskTemplateTargetoption();
+ ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScriptVO.getId());
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateTargetoptionMapper.selectIvrTaskTemplateTargetoptionList(ivrTaskTemplateTargetoption);
+ ObjectMapper mapper = new ObjectMapper();
+ for (int i = 0; i < ivrTaskTemplateTargetoptions.size(); i++) {
+ if (!StringUtils.isEmpty(ivrTaskTemplateTargetoptions.get(i).getNodynamiccruxsJson())) {
+ try {
+ ivrTaskTemplateTargetoptions.get(i).setNodynamiccruxs(mapper.readValue(ivrTaskTemplateTargetoptions.get(i).getNodynamiccruxsJson(), List.class));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (!StringUtils.isEmpty(ivrTaskTemplateTargetoptions.get(i).getDynamiccruxsJson())) {
+ try {
+ ivrTaskTemplateTargetoptions.get(i).setDynamiccruxs(mapper.readValue(ivrTaskTemplateTargetoptions.get(i).getDynamiccruxsJson(), List.class));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
+ }
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
}
ivrTaskTemplateVO.setIvrTaskTemplateScriptVOList(ivrTaskTemplateScriptVOS);
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index 0e7e43b..d2aafeb 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -46,7 +46,8 @@
<result property="sort" column="sort"/>
<result property="score" column="score"/>
<result property="ivrtext" column="ivrtext"/>
- <result property="groupName" column=" group_name"/>
+ <result property="groupName" column="group_name"/>
+ <result property="scriptTopic" column="script_topic"/>
</resultMap>
<sql id="selectIvrTaskTemplateScriptVo">
@@ -55,6 +56,7 @@
sort,
ivrtext,
script_type,
+ script_topic,
score,
branch_flag,
branch_nextscriptno,
@@ -82,6 +84,7 @@
del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="score != null ">and score = #{score}</if>
+ <if test="scriptTopic != null ">and script_topic = #{scriptTopic}</if>
<if test="ivrtext != null ">and ivrtext = #{ivrtext}</if>
<if test="sort != null ">and sort = #{sort}</if>
<if test="templateID != null ">and templateID = #{templateID}</if>
@@ -171,6 +174,7 @@
<if test="nextScriptno != null and nextScriptno != ''">next_scriptno,</if>
<if test="score != null ">score,</if>
<if test="ivrtext != null ">ivrtext,</if>
+ <if test="scriptTopic != null ">script_topic,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -213,6 +217,7 @@
<if test="nextScriptno != null and nextScriptno != ''">#{nextScriptno},</if>
<if test="score != null ">#{score},</if>
<if test="ivrtext != null ">#{ivrtext},</if>
+ <if test="scriptTopic != null ">#{scriptTopic},</if>
</trim>
</insert>
@@ -261,18 +266,18 @@
<if test="nextScriptno != null and nextScriptno != ''">next_scriptno = #{nextScriptno},</if>
<if test="score != null">score = #{score},</if>
<if test="ivrtext != null">ivrtext = #{ivrtext},</if>
+ <if test="scriptTopic != null ">script_topic = #{scriptTopic},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteIvrTaskTemplateScriptByID" parameterType="Long">
- delete
- from ivr_task_template_script
+ update ivr_task_template_script set del_flag=1
where ID = #{ID}
</delete>
<delete id="deleteIvrTaskTemplateScriptByIDs" parameterType="String">
- delete from ivr_task_template_script where id in
+ update ivr_task_template_script set del_flag=1 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
--
Gitblit v1.9.3