From 580f358ce4e50816211d69ff6e31817b6593d731 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 十月 2024 17:32:50 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java | 3 +
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 5 ++
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java | 3 +
smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java | 7 +++
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java | 3 +
smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java | 7 +++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 18 ++++----
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java | 2 +
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 1
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java | 8 ++++
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 11 +++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 2
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 6 +++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml | 6 +++
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 2 +
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 6 +++
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java | 7 +++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml | 6 +++
19 files changed, 93 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 9312c1f..2db096c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -258,6 +258,7 @@
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
serviceSubtaskRecord.setUuid(uuid);
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("3");
@@ -348,6 +349,7 @@
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
serviceSubtaskRecord.setUuid(uuid);
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("5");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 06f9e73..952d587 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -12,7 +12,9 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
+import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -41,6 +43,9 @@
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+ @Autowired
+ private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@@ -53,6 +58,12 @@
PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
+ }
Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
map.put("serviceSubtaskList", serviceSubtaskList);
List<Map<String, Object>> list = new ArrayList<>();
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
index 68086bf..eb5dc3b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
@@ -303,6 +303,13 @@
@ApiModelProperty(value = "鏄惁蹇呭～锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�")
private String isMust;
+ /**
+ * 缁勫埆
+ */
+ @Excel(name = "缁勫埆")
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
// /**
// * 闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級
// */
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
index 72aa452..dc7f6ff 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
@@ -112,6 +112,14 @@
private String noMatchVoice;
/**
+ * 缁勫埆
+ */
+ @Excel(name = "缁勫埆")
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
+
+ /**
* 闈欓粯璇濇湳
*/
@Excel(name = "闈欓粯璇濇湳")
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
index e115f46..2cdb6f2 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScript.java
@@ -43,6 +43,13 @@
@ApiModelProperty(value = "鍒嗘暟")
private BigDecimal score;
+ /**
+ * 缁勫埆
+ */
+ @Excel(name = "缁勫埆")
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
/**
* 閫傜敤棰樺瀷锛�1.鍗曢�� 2澶氶�� 3濉┖ 4鍏跺畠锛�
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
index af9ce72..9420f17 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
@@ -151,6 +151,13 @@
private String noClearlyVoice;
/**
+ * 缁勫埆
+ */
+ @Excel(name = "缁勫埆")
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
+ /**
* 绫诲埆鍚�
*/
@Excel(name = "绫诲埆鍚�")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 3cd80c8..2ee55de 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -337,7 +337,7 @@
*/
@Excel(name = " 瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.浜岀淮鐮� 7.閽夐拤 8.寰俊")
@ApiModelProperty("瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊")
- private String serviceform;
+ private String preachform;
/**
* 搴婂彿
@@ -521,4 +521,7 @@
@ApiModelProperty(value = "鍑洪櫌閮ㄩ棬缂栧彿闆嗗悎")
private List<String> leaveldeptcodes;
+ @ApiModelProperty(value = "鍙戦�佽鎯�")
+ private List<ServiceSubtaskRecord> serviceSubtaskRecordList;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
index 9b96991..3b2e373 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
@@ -274,4 +274,7 @@
@ApiModelProperty(value = "鎸囨爣閫夐」姹囨��")
private String targetoptions;
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
index c87c052..f3b97db 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
@@ -65,6 +65,8 @@
@ApiModelProperty("svy_lib_script棰樼洰id")
private Long scriptid;
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
/**
* 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ 4鍏跺畠
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
index d6ea8e0..72ce836 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
@@ -231,4 +231,7 @@
@ApiModelProperty(value = "搴忓彿")
private Long xh;
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
index 0dfc9a9..96449a0 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
@@ -310,6 +310,9 @@
@ApiModelProperty("鎺掑簭")
private Long sort;
+ @ApiModelProperty(value = "缁勫埆")
+ private String groupName;
+
/**
* 璇濇湳閫夐」
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 9a3ea25..8dd64c6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -324,7 +324,7 @@
serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
serviceSubtask.setServiceType("2");
- serviceSubtask.setServiceform(serviceTask.getPreachform());
+ serviceSubtask.setPreachform(serviceTask.getPreachform());
serviceSubtask.setHospType("2");
serviceSubtask.setCreateTime(new Date());
serviceSubtask.setUpdateTime(new Date());
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 1a0cf5b..04dcde3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -609,7 +609,7 @@
Pattern pattern2 = Pattern.compile(ivrLibaExtemplatescript.getSelfRegex2());
matcher2 = pattern2.matcher(returnQues.getContent());
}
- log.info("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
+ log.error("++++++++++++++++++++++++++閫氱敤搴撴槸鍚︿负绌猴細selfRegex : {} , selfRegex2 : {}", ivrLibaExtemplatescript.getSelfRegex(), ivrLibaExtemplatescript.getSelfRegex2());
if (StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches() && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && matcher2.matches() || StringUtils.isEmpty(ivrLibaExtemplatescript.getSelfRegex2()) && StringUtils.isNotEmpty(ivrLibaExtemplatescript.getSelfRegex()) && matcher.matches()) {
QuestionMessage questionMessage = redisCache.getCacheObject(phoneCallBackVO.getUuid() + "returnQues");
IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = returnQues.getNowQuestion();
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index 50c8b1e..255d283 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -47,12 +47,14 @@
<result property="branchNextscriptno" column="branch_nextscriptno"/>
<result property="sort" column="sort"/>
<result property="score" column="score"/>
+ <result property="groupName" column="group_name"/>
</resultMap>
<sql id="selectIvrLibaTemplateScriptVo">
select id,
scriptno,
sort,
+ group_name,
branch_flag,
branch_nextscriptno,
templateid,
@@ -100,6 +102,7 @@
<where>
del_flag=0
<if test="scriptno != null ">and scriptno = #{scriptno}</if>
+ <if test="groupName != null ">and group_name = #{groupName}</if>
<if test="scriptDesc != null ">and script_desc = #{scriptDesc}</if>
<if test="templateid != null ">and templateid = #{templateid}</if>
<if test="scriptPoint != null and scriptPoint != ''">and script_point = #{scriptPoint}</if>
@@ -192,6 +195,7 @@
<if test="sort != null ">sort,</if>
<if test="score != null ">score,</if>
<if test="ivrtext != null ">ivrtext,</if>
+ <if test="groupName != null ">group_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="scriptno != null">#{scriptno},</if>
@@ -234,6 +238,7 @@
<if test="sort != null ">#{sort},</if>
<if test="score != null ">#{score},</if>
<if test="ivrtext != null ">#{ivrtext},</if>
+ <if test="groupName != null ">#{groupName},</if>
</trim>
</insert>
@@ -278,6 +283,7 @@
<if test="ivrtext != null ">ivrtext = #{ivrtext},</if>
<if test="branchFlag != null and branchFlag != ''">branch_flag = #{branchFlag},</if>
<if test="score != null ">score = #{score},</if>
+ <if test="groupName != null ">group_name = #{groupName},</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno =
#{branchNextscriptno},
</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index eb07f5d..912252f 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -46,6 +46,7 @@
<result property="sort" column="sort"/>
<result property="score" column="score"/>
<result property="ivrtext" column="ivrtext"/>
+ <result property="groupName" column=" group_name"/>
</resultMap>
<sql id="selectIvrTaskTemplateScriptVo">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index ba421b1..75c9356 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -39,7 +39,7 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="textParam" column="text_param"/>
- <result property="serviceform" column="serviceform"/>
+ <result property="preachform" column="preachform"/>
<result property="bedNo" column="bed_no"/>
<result property="sendType" column="send_type"/>
<result property="taskName" column="task_name"/>
@@ -132,7 +132,7 @@
pid,
guid,
text_param,
- serviceform,
+ preachform,
bed_no,
send_type,
task_name,
@@ -213,7 +213,7 @@
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="pid != null ">and pid = #{pid}</if>
- <if test="serviceform != null ">and serviceform = #{serviceform}</if>
+ <if test="preachform != null ">and preachform = #{preachform}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="textParam != null and textParam != ''">and text_param = #{textParam}</if>
<if test="bedNo != null">and bed_no = #{bedNo}</if>
@@ -285,7 +285,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
- <if test="serviceform != null">serviceform,</if>
+ <if test="preachform != null">preachform,</if>
<if test="bedNo != null">bed_no,</if>
<if test="sendType != null and sendType != ''">send_type,</if>
<if test="taskName != null and taskName != ''">task_name,</if>
@@ -355,7 +355,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
- <if test="serviceform != null">#{serviceform},</if>
+ <if test="preachform != null">#{preachform},</if>
<if test="bedNo != null">#{bedNo},</if>
<if test="sendType != null and sendType != ''">#{sendType},</if>
<if test="taskName != null and taskName != ''">#{taskName},</if>
@@ -429,7 +429,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -504,7 +504,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -580,7 +580,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -674,7 +674,7 @@
pid,
guid,
text_param,
- serviceform,
+ preachform,
bed_no,
send_type,
task_name,
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
index 3e6fd1f..2a72f0d 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.smartor.domain.ServiceSubtaskRecord" id="ServiceSubtaskRecordResult">
<result property="id" column="id"/>
<result property="taskid" column="taskid"/>
+ <result property="subtaskId" column="subtask_id"/>
<result property="uuid" column="uuid"/>
<result property="tasktype" column="tasktype"/>
<result property="preachform" column="preachform"/>
@@ -30,6 +31,7 @@
<sql id="selectServiceSubtaskRecordVo">
select id,
taskid,
+ subtask_id,
uuid,
tasktype,
preachform,
@@ -56,6 +58,7 @@
<include refid="selectServiceSubtaskRecordVo"/>
<where>
<if test="taskid != null and taskid != ''">and taskid = #{taskid}</if>
+ <if test="subtaskId != null ">and subtask_id = #{subtaskId}</if>
<if test="uuid != null and uuid != ''">and uuid = #{uuid}</if>
<if test="tasktype != null and tasktype != ''">and tasktype = #{tasktype}</if>
<if test="preachform != null and preachform != ''">and preachform = #{preachform}</if>
@@ -100,6 +103,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="remark != null">remark,</if>
+ <if test="subtaskId != null ">subtask_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -122,6 +126,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="remark != null">#{remark},</if>
+ <if test="subtaskId != null ">#{subtaskId},</if>
</trim>
</insert>
@@ -147,6 +152,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="subtaskId != null ">subtask_id = #{subtaskId},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
index 7d84eb7..b928d09 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -45,12 +45,14 @@
<result property="targettype" column="targettype"/>
<result property="targetoptions" column="targetoptions"/>
<result property="prompt" column="prompt"/>
+ <result property="groupName" column="group_name"/>
</resultMap>
<sql id="selectSvyLibTemplateScriptVo">
select id,
script_type,
targetid,
+ group_name,
targetname,
score,
prompt,
@@ -127,6 +129,7 @@
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
<if test="targetoptions != null and targetoptions != ''">and targetoptions = #{targetoptions}</if>
<if test="score != null">and score = #{score}</if>
+ <if test="groupName != null">and group_name = #{groupName}</if>
</where>
</select>
@@ -178,6 +181,7 @@
<if test="targettype != null and targettype != ''">targettype,</if>
<if test="targetoptions != null and targetoptions != ''">targetoptions,</if>
<if test="prompt != null and prompt != ''">prompt,</if>
+ <if test="groupName != null and groupName != ''">group_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nextScriptno != null">#{nextScriptno},</if>
@@ -219,6 +223,7 @@
<if test="targettype != null and targettype != ''">#{targettype},</if>
<if test="targetoptions != null and targetoptions != ''">#{targetoptions},</if>
<if test="prompt != null and prompt != ''">#{prompt},</if>
+ <if test="groupName != null and groupName != ''">#{groupName},</if>
</trim>
</insert>
@@ -266,6 +271,7 @@
<if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
<if test="targetoptions != null and targetoptions != ''">targetoptions = #{targetoptions},</if>
<if test="prompt != null and prompt != ''">prompt = #{prompt},</if>
+ <if test="groupName != null and groupName != ''">group_name = #{groupName},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 1f9b4dd..5a5fe37 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -42,6 +42,7 @@
<result property="targetname" column="targetname"/>
<result property="score" column="score"/>
<result property="prompt" column="prompt"/>
+ <result property="groupName" column="group_name"/>
</resultMap>
@@ -49,6 +50,7 @@
select id,
sort,
prompt,
+ group_name,
branch_flag,
branch_nextscriptno,
score,
@@ -98,6 +100,7 @@
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
<if test="score != null ">and score = #{score}</if>
<if test="prompt != null ">and prompt = #{prompt}</if>
+ <if test="groupName != null ">and group_name = #{groupName}</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
@@ -149,6 +152,7 @@
<if test="targettype != null and targettype != ''">targettype,</if>
<if test="score != null ">score,</if>
<if test="prompt != null ">prompt,</if>
+ <if test="groupName != null ">group_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -187,6 +191,7 @@
<if test="targettype != null and targettype != ''">#{targettype},</if>
<if test="score != null ">#{score},</if>
<if test="prompt != null ">#{prompt},</if>
+ <if test="groupName != null ">#{groupName},</if>
</trim>
</insert>
@@ -231,6 +236,7 @@
<if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
<if test="score != null">score = #{score},</if>
<if test="prompt != null">prompt = #{prompt},</if>
+ <if test="groupName != null ">group_name = #{groupName},</if>
</trim>
where id = #{d}
</update>
--
Gitblit v1.9.3