From 80ba21616141b4b95243ed62bd22b0e2d9290a63 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 13:53:52 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java | 13 +
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java | 7
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java | 15 ++
smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java | 12 -
smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml | 20 +-
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java | 12 +
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java | 6
ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml | 166 ++++++++++++++---------
smartor/src/main/java/com/smartor/domain/SvyLibScript.java | 12 +
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 6
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml | 27 +++
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml | 33 +++
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 24 ++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml | 1
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java | 6
smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml | 1
16 files changed, 260 insertions(+), 101 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
index bab1ce8..77c696f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
@@ -1,73 +1,106 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BaseUserInfoMapper">
- <resultMap type="BaseUserInfo" id="BaseUserInfoResult">
- <result property="userid" column="userid" />
- <result property="usercode" column="usercode" />
- <result property="account" column="account" />
- <result property="phone" column="phone" />
- <result property="password" column="password" />
- <result property="secret" column="secret" />
- <result property="realname" column="realname" />
- <result property="nickname" column="nickname" />
- <result property="roleid" column="roleid" />
- <result property="rolename" column="rolename" />
- <result property="deptid" column="deptid" />
- <result property="deptname" column="deptname" />
- <result property="wardid" column="wardid" />
- <result property="wardname" column="wardname" />
- <result property="usertype" column="usertype" />
- <result property="usertypename" column="usertypename" />
- <result property="dwpermission" column="dwpermission" />
- <result property="isopenlowerorg" column="isopenlowerorg" />
- <result property="isopenshareknow" column="isopenshareknow" />
- <result property="isopengeneraldata" column="isopengeneraldata" />
- <result property="orgid" column="orgid" />
- <result property="delFlag" column="del_flag" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="isupload" column="isupload" />
- <result property="uploadTime" column="upload_time" />
- <result property="deptpermission" column="deptpermission" />
- <result property="wardpermission" column="wardpermission" />
+ <resultMap type="com.ruoyi.system.domain.BaseUserInfo" id="BaseUserInfoResult">
+ <result property="userid" column="userid"/>
+ <result property="usercode" column="usercode"/>
+ <result property="account" column="account"/>
+ <result property="phone" column="phone"/>
+ <result property="password" column="password"/>
+ <result property="secret" column="secret"/>
+ <result property="realname" column="realname"/>
+ <result property="nickname" column="nickname"/>
+ <result property="roleid" column="roleid"/>
+ <result property="rolename" column="rolename"/>
+ <result property="deptid" column="deptid"/>
+ <result property="deptname" column="deptname"/>
+ <result property="wardid" column="wardid"/>
+ <result property="wardname" column="wardname"/>
+ <result property="usertype" column="usertype"/>
+ <result property="usertypename" column="usertypename"/>
+ <result property="dwpermission" column="dwpermission"/>
+ <result property="isopenlowerorg" column="isopenlowerorg"/>
+ <result property="isopenshareknow" column="isopenshareknow"/>
+ <result property="isopengeneraldata" column="isopengeneraldata"/>
+ <result property="orgid" column="orgid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="deptpermission" column="deptpermission"/>
+ <result property="wardpermission" column="wardpermission"/>
</resultMap>
<sql id="selectBaseUserInfoVo">
- select userid, usercode, account, phone, password, secret, realname, nickname, roleid, rolename, deptid, deptname, wardid, wardname, usertype, usertypename, dwpermission, isopenlowerorg, isopenshareknow, isopengeneraldata, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, deptpermission, wardpermission from base_user_info
+ select userid,
+ usercode,
+ account,
+ phone,
+ password,
+ secret,
+ realname,
+ nickname,
+ roleid,
+ rolename,
+ deptid,
+ deptname,
+ wardid,
+ wardname,
+ usertype,
+ usertypename,
+ dwpermission,
+ isopenlowerorg,
+ isopenshareknow,
+ isopengeneraldata,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ deptpermission,
+ wardpermission
+ from base_user_info
</sql>
- <select id="selectBaseUserInfoList" parameterType="BaseUserInfo" resultMap="BaseUserInfoResult">
+ <select id="selectBaseUserInfoList" parameterType="com.ruoyi.system.domain.BaseUserInfo"
+ resultMap="BaseUserInfoResult">
<include refid="selectBaseUserInfoVo"/>
<where>
- <if test="usercode != null and usercode != ''"> and usercode = #{usercode}</if>
- <if test="account != null and account != ''"> and account = #{account}</if>
- <if test="phone != null and phone != ''"> and phone = #{phone}</if>
- <if test="password != null and password != ''"> and password = #{password}</if>
- <if test="secret != null and secret != ''"> and secret = #{secret}</if>
- <if test="realname != null and realname != ''"> and realname like concat('%', #{realname}, '%')</if>
- <if test="nickname != null and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
- <if test="roleid != null "> and roleid = #{roleid}</if>
- <if test="rolename != null and rolename != ''"> and rolename like concat('%', #{rolename}, '%')</if>
- <if test="deptid != null and deptid != ''"> and deptid = #{deptid}</if>
- <if test="deptname != null and deptname != ''"> and deptname like concat('%', #{deptname}, '%')</if>
- <if test="wardid != null and wardid != ''"> and wardid = #{wardid}</if>
- <if test="wardname != null and wardname != ''"> and wardname like concat('%', #{wardname}, '%')</if>
- <if test="usertype != null "> and usertype = #{usertype}</if>
- <if test="usertypename != null and usertypename != ''"> and usertypename like concat('%', #{usertypename}, '%')</if>
- <if test="dwpermission != null "> and dwpermission = #{dwpermission}</if>
- <if test="isopenlowerorg != null "> and isopenlowerorg = #{isopenlowerorg}</if>
- <if test="isopenshareknow != null "> and isopenshareknow = #{isopenshareknow}</if>
- <if test="isopengeneraldata != null "> and isopengeneraldata = #{isopengeneraldata}</if>
- <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
- <if test="isupload != null "> and isupload = #{isupload}</if>
- <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
- <if test="deptpermission != null and deptpermission != ''"> and deptpermission = #{deptpermission}</if>
- <if test="wardpermission != null and wardpermission != ''"> and wardpermission = #{wardpermission}</if>
+ <if test="usercode != null and usercode != ''">and usercode = #{usercode}</if>
+ <if test="account != null and account != ''">and account = #{account}</if>
+ <if test="phone != null and phone != ''">and phone = #{phone}</if>
+ <if test="password != null and password != ''">and password = #{password}</if>
+ <if test="secret != null and secret != ''">and secret = #{secret}</if>
+ <if test="realname != null and realname != ''">and realname like concat('%', #{realname}, '%')</if>
+ <if test="nickname != null and nickname != ''">and nickname like concat('%', #{nickname}, '%')</if>
+ <if test="roleid != null ">and roleid = #{roleid}</if>
+ <if test="rolename != null and rolename != ''">and rolename like concat('%', #{rolename}, '%')</if>
+ <if test="deptid != null and deptid != ''">and deptid = #{deptid}</if>
+ <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
+ <if test="wardid != null and wardid != ''">and wardid = #{wardid}</if>
+ <if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
+ <if test="usertype != null ">and usertype = #{usertype}</if>
+ <if test="usertypename != null and usertypename != ''">and usertypename like concat('%', #{usertypename},
+ '%')
+ </if>
+ <if test="dwpermission != null ">and dwpermission = #{dwpermission}</if>
+ <if test="isopenlowerorg != null ">and isopenlowerorg = #{isopenlowerorg}</if>
+ <if test="isopenshareknow != null ">and isopenshareknow = #{isopenshareknow}</if>
+ <if test="isopengeneraldata != null ">and isopengeneraldata = #{isopengeneraldata}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="deptpermission != null and deptpermission != ''">and deptpermission = #{deptpermission}</if>
+ <if test="wardpermission != null and wardpermission != ''">and wardpermission = #{wardpermission}</if>
</where>
</select>
@@ -76,7 +109,8 @@
where userid = #{userid}
</select>
- <insert id="insertBaseUserInfo" parameterType="BaseUserInfo" useGeneratedKeys="true" keyProperty="userid">
+ <insert id="insertBaseUserInfo" parameterType="com.ruoyi.system.domain.BaseUserInfo" useGeneratedKeys="true"
+ keyProperty="userid">
insert into base_user_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="usercode != null">usercode,</if>
@@ -108,7 +142,7 @@
<if test="uploadTime != null">upload_time,</if>
<if test="deptpermission != null">deptpermission,</if>
<if test="wardpermission != null">wardpermission,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="usercode != null">#{usercode},</if>
<if test="account != null">#{account},</if>
@@ -139,10 +173,10 @@
<if test="uploadTime != null">#{uploadTime},</if>
<if test="deptpermission != null">#{deptpermission},</if>
<if test="wardpermission != null">#{wardpermission},</if>
- </trim>
+ </trim>
</insert>
- <update id="updateBaseUserInfo" parameterType="BaseUserInfo">
+ <update id="updateBaseUserInfo" parameterType="com.ruoyi.system.domain.BaseUserInfo">
update base_user_info
<trim prefix="SET" suffixOverrides=",">
<if test="usercode != null">usercode = #{usercode},</if>
@@ -179,7 +213,9 @@
</update>
<delete id="deleteBaseUserInfoByUserid" parameterType="Long">
- delete from base_user_info where userid = #{userid}
+ delete
+ from base_user_info
+ where userid = #{userid}
</delete>
<delete id="deleteBaseUserInfoByUserids" parameterType="String">
@@ -188,4 +224,4 @@
#{userid}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java
index 844fe8f..d7f9e5e 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplateCategory.java
@@ -1,15 +1,13 @@
package com.smartor.domain;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
/**
* 閫氱敤妯℃澘鍒嗙被瀵硅薄 ivr_liba_extemplate_category
@@ -26,7 +24,7 @@
* 鑷ID
*/
@ApiModelProperty("鑷ID锛堜富閿級")
- private Long intertcatid;
+ private Long id;
/**
* 鍒嗙被鍚嶇О
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
index 5da51d2..b9d1f8d 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
@@ -261,6 +261,12 @@
@ApiModelProperty(value = "鎸囨爣ID")
private Integer targetid;
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer sort;
+
/**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
index 7e0593b..59dc22a 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
@@ -237,6 +237,12 @@
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer sort;
+
// /**
// * 鍩虹鎸囨爣绫诲瀷
// */
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibScript.java b/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
index 8913e13..dcc509f 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibScript.java
@@ -170,6 +170,18 @@
@ApiModelProperty(value = "闂涓婚")
private String scriptTopic;
+ @ApiModelProperty(value = "瀵瑰簲鐨刬vr_liba_target鐨勪富閿�")
+ private Long targetid;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣绫诲瀷")
+ private String targettype;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣鍚嶇О")
+ private String targetname;
+
+ @ApiModelProperty(value = "鎸囨爣閫夐」姹囨��")
+ private String targetoptions;
+
@ApiModelProperty(value = "閫傜敤鐤剧梾锛堟暟缁勶級")
private List<String> icd10NameList;
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
index 412099b..e2fe218 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
@@ -255,4 +255,16 @@
@ApiModelProperty(value = "閫夐」鍒嗘敮鐨勪笅涓�涓瘽鏈紪鍙�")
private String branchNextscriptno;
+ @ApiModelProperty(value = "瀵瑰簲鐨刬vr_liba_target鐨勪富閿�")
+ private Long targetid;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣绫诲瀷")
+ private String targettype;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣鍚嶇О")
+ private String targetname;
+
+ @ApiModelProperty(value = "鎸囨爣閫夐」姹囨��")
+ private String targetoptions;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
index ad5020b..3eddcde 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
@@ -137,7 +137,7 @@
* 鎸囨爣閫夐」*
*/
@ApiModelProperty(value = "鎸囨爣閫夐」*")
- private String targetOptions;
+ private String targetoptions;
/**
* 鍩虹鎸囨爣绫诲瀷锛�1 閫夐」 2 鏂囨湰 3 鏁板�硷級
@@ -203,4 +203,17 @@
@ApiModelProperty(value = "閫夐」鍒嗘敮鐨勪笅涓�涓瘽鏈紪鍙�")
private String branchNextscriptno;
+ @ApiModelProperty(value = "鍩虹鎸囨爣绫诲瀷")
+ private String targettype;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣鍚嶇О")
+ private String targetname;
+
+ /**
+ * 搴忓彿
+ */
+ @Excel(name = "搴忓彿")
+ @ApiModelProperty(value = "搴忓彿")
+ private Long xh;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
index 607827b..06514fe 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
@@ -203,6 +203,19 @@
private String branchNextscriptno;
+ @ApiModelProperty(value = "鍩虹鎸囨爣绫诲瀷")
+ private String targettype;
+
+ @ApiModelProperty(value = "鍩虹鎸囨爣鍚嶇О")
+ private String targetname;
+
+ /**
+ * 搴忓彿
+ */
+ @Excel(name = "搴忓彿")
+ @ApiModelProperty(value = "搴忓彿")
+ private Long xh;
+
/**
* 璇濇湳閫夐」
*/
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
index e0d4d0d..e5d0755 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
@@ -136,19 +136,16 @@
//鏍囩澶勭悊
if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibScriptTagList())) {
for (SvyLibScriptTag svyLibScriptTag : svyLibTopic.getSvyLibScriptTagList()) {
- if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 1) {
+ if (svyLibScriptTag.getId() == null) {
//鏂板
svyLibScriptTag.setScriptid(svyLibTopic.getId());
svyLibScriptTag.setCreateTime(new Date());
svyLibScriptTagMapper.insertSvyLibScriptTag(svyLibScriptTag);
- } else if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 2) {
+ } else if (svyLibScriptTag.getId() != null) {
//淇敼
svyLibScriptTag.setScriptid(svyLibTopic.getId());
svyLibScriptTag.setUpdateTime(new Date());
svyLibScriptTagMapper.updateSvyLibScriptTag(svyLibScriptTag);
- } else if (svyLibScriptTag.getIsoperation() != null && svyLibScriptTag.getIsoperation() == 3) {
- //鍒犻櫎
- svyLibScriptTagMapper.deleteSvyLibScriptTagById(svyLibScriptTag.getId());
}
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
index 9141541..e9c3c1e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.smartor.mapper.IvrLibaExtemplateCategoryMapper">
<resultMap type="com.smartor.domain.IvrLibaExtemplateCategory" id="IvrLibaExtemplateCategoryResult">
- <result property="intertcatid" column="intertcatid"/>
+ <result property="id" column="id"/>
<result property="categoryname" column="categoryname"/>
<result property="orgid" column="orgid"/>
<result property="delFlag" column="del_flag"/>
@@ -21,7 +21,7 @@
</resultMap>
<sql id="selectIvrLibaExtemplateCategoryVo">
- select intertcatid,
+ select id,
categoryname,
orgid,
del_flag,
@@ -58,7 +58,7 @@
<select id="selectIvrLibaExtemplateCategoryByIntertcatid" parameterType="Long"
resultMap="IvrLibaExtemplateCategoryResult">
<include refid="selectIvrLibaExtemplateCategoryVo"/>
- where intertcatid = #{intertcatid} and del_flag = 0
+ where id = #{id} and del_flag = 0
</select>
<select id="selectSeqMax" resultType="integer">
@@ -68,7 +68,7 @@
</select>
<insert id="insertIvrLibaExtemplateCategory" parameterType="com.smartor.domain.IvrLibaExtemplateCategory"
- useGeneratedKeys="true" keyProperty="intertcatid">
+ useGeneratedKeys="true" keyProperty="id">
insert into ivr_liba_extemplate_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="categoryname != null">categoryname,</if>
@@ -116,7 +116,7 @@
<if test="guid != null">guid = #{guid},</if>
<if test="seqno != null">seqno = #{seqno},</if>
</trim>
- where intertcatid = #{intertcatid}
+ where id = #{id}
</update>
<update id="deleteIvrLibaExtemplateCategoryByIntertcatid" parameterType="Long">
@@ -124,13 +124,13 @@
<trim prefix="SET" suffixOverrides=",">
del_flag = 1
</trim>
- where intertcatid = #{intertcatid}
+ where id = #{id}
</update>
<delete id="deleteIvrLibaExtemplateCategoryByIntertcatids" parameterType="String">
- delete from ivr_liba_extemplate_category where intertcatid in
- <foreach item="intertcatid" collection="array" open="(" separator="," close=")">
- #{intertcatid}
+ delete from ivr_liba_extemplate_category where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index 58ddb07..48524ef 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -44,11 +44,13 @@
<result property="scriptType" column="script_type"/>
<result property="branchFlag" column="branch_flag"/>
<result property="branchNextscriptno" column="branch_nextscriptno"/>
+ <result property="sort" column="sort"/>
</resultMap>
<sql id="selectIvrLibaTemplateScriptVo">
select id,
scriptno,
+ sort,
branch_flag,
branch_nextscriptno,
templateid,
@@ -129,6 +131,7 @@
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="isMust != null and isMust != ''">and is_must = #{isMust}</if>
<if test="scriptType != null">and script_type = #{scriptType}</if>
+ <if test="sort != null">and sort = #{sort}</if>
</where>
</select>
@@ -179,6 +182,7 @@
<if test="scriptType != null ">script_type,</if>
<if test="branchFlag != null and branchFlag != ''">branch_flag,</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno,</if>
+ <if test="sort != null ">sort,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="scriptno != null">#{scriptno},</if>
@@ -218,6 +222,7 @@
<if test="scriptType != null ">#{scriptType},</if>
<if test="branchFlag != null and branchFlag != ''">#{branchFlag},</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">#{branchNextscriptno},</if>
+ <if test="sort != null ">#{sort},</if>
</trim>
</insert>
@@ -258,6 +263,7 @@
<if test="isMust != null and isMust != ''">is_must = #{isMust}</if>
<if test="scriptDesc != null ">script_desc = #{scriptDesc}</if>
<if test="scriptType != null ">script_type = #{scriptType}</if>
+ <if test="sort != null ">sort = #{sort}</if>
<if test="branchFlag != null and branchFlag != ''">branch_flag = #{branchFlag},</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno =
#{branchNextscriptno},
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
index cd9b359..73696dc 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -21,7 +21,6 @@
<result property="updateTime" column="update_time"/>
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
- <result property="tag" column="tag"/>
<result property="categoryid" column="categoryid"/>
<result property="scriptContent" column="script_content"/>
<result property="suitway" column="suitway"/>
@@ -34,11 +33,19 @@
<result property="score" column="score"/>
<result property="icd10Name" column="icd10_name"/>
<result property="scriptTopic" column="script_topic"/>
+ <result property="targetid" column="targetid"/>
+ <result property="targetname" column="targetname"/>
+ <result property="targettype" column="targettype"/>
+ <result property="targetoptions" column="targetoptions"/>
</resultMap>
<sql id="selectSvyLibScriptVo">
select id,
scoretype,
+ targetid,
+ targetname,
+ targettype,
+ targetoptions,
score,
value_type,
reply,
@@ -57,7 +64,6 @@
update_time,
isupload,
upload_time,
- tag,
categoryid,
script_content,
suitway,
@@ -76,7 +82,9 @@
<if test="id != null ">and id = #{id}</if>
<if test="scriptType != null and scriptType != ''">and script_type = #{scriptType}</if>
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
- <if test="scriptContent != null and scriptContent != ''">and script_content like concat('%', #{scriptContent}, '%')</if>
+ <if test="scriptContent != null and scriptContent != ''">and script_content like concat('%',
+ #{scriptContent}, '%')
+ </if>
<if test="icd10Name != null and icd10Name != ''">and icd10_name like concat('%', #{icd10Name}, '%')</if>
<if test="ishide != null ">and ishide = #{ishide}</if>
@@ -87,6 +95,10 @@
<if test="scoretype != null and scoretype != ''">and scoretype = #{scoretype}</if>
<if test="score != null and score != ''">and score = #{score}</if>
<if test="scriptTopic != null and scriptTopic != ''">and script_topic = #{scriptTopic}</if>
+ <if test="targetid != null ">and targetid = #{targetid}</if>
+ <if test="targetname != null and targetname != ''">and targetname = #{targetname}</if>
+ <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
+ <if test="targetoptions != null and targetoptions != ''">and targetoptions = #{targetoptions}</if>
</where>
order by id desc
</select>
@@ -114,7 +126,6 @@
<if test="updateTime != null">update_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
- <if test="tag != null">tag,</if>
<if test="categoryid != null">categoryid,</if>
<if test="scriptContent != null and scriptContent != ''">script_content,</if>
<if test="suitway != null and suitway != ''">suitway,</if>
@@ -128,6 +139,10 @@
<if test="icd10Name != null and icd10Name!=''">icd10_name,</if>
<if test="picturePath != null and picturePath != ''">picture_path,</if>
<if test="scriptTopic != null and scriptTopic != ''">script_topic,</if>
+ <if test="targetid != null ">targetid,</if>
+ <if test="targetname != null and targetname != ''">targetname,</if>
+ <if test="targettype != null and targettype != ''">targettype,</if>
+ <if test="targetoptions != null and targetoptions != ''">targetoptions,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="scriptType != null">#{scriptType},</if>
@@ -144,7 +159,6 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
- <if test="tag != null">#{tag},</if>
<if test="categoryid != null">#{categoryid},</if>
<if test="scriptContent != null and scriptContent != ''">#{scriptContent},</if>
<if test="suitway != null and suitway != ''">#{suitway},</if>
@@ -158,6 +172,10 @@
<if test="icd10Name != null and icd10Name!=''">#{icd10Name},</if>
<if test="picturePath != null and picturePath != ''">#{picturePath},</if>
<if test="scriptTopic != null and scriptTopic != ''">#{scriptTopic},</if>
+ <if test="targetid != null ">#{targetid},</if>
+ <if test="targetname != null and targetname != ''">#{targetname},</if>
+ <if test="targettype != null and targettype != ''">#{targettype},</if>
+ <if test="targetoptions != null and targetoptions != ''">#{targetoptions},</if>
</trim>
</insert>
@@ -182,7 +200,6 @@
<if test="scriptContent != null">script_content = #{scriptContent},</if>
<if test="suitway != null">suitway = #{suitway},</if>
<if test="isavailable != null">isavailable = #{isavailable},</if>
- <if test="tag != null">tag = #{tag},</if>
<if test="language != null and language!=''">language = #{language},</if>
<if test="otherdata != null and otherdata!=''">otherdata = #{otherdata},</if>
<if test="valueType != null and valueType!=''">value_type = #{valueType},</if>
@@ -192,6 +209,10 @@
<if test="icd10Name != null and icd10Name!=''">icd10_name = #{icd10Name},</if>
<if test="picturePath != null and picturePath != ''">picture_path = #{picturePath},</if>
<if test="scriptTopic != null and scriptTopic != ''">script_topic = #{scriptTopic},</if>
+ <if test="targetid != null ">targetid = #{targetid},</if>
+ <if test="targetname != null and targetname != ''">targetname = #{targetname},</if>
+ <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
+ <if test="targetoptions != null and targetoptions != ''">targetoptions = #{targetoptions},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
index 32e3dd1..09f246f 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
@@ -45,6 +45,7 @@
resultMap="SvyLibScriptTagResult">
<include refid="selectSvyLibScriptTagVo"/>
<where>
+ del_flag = 0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
index 76de18d..72dea58 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -40,11 +40,19 @@
<result property="scriptTopic" column="script_topic"/>
<result property="branchFlag" column="branch_flag"/>
<result property="branchNextscriptno" column="branch_nextscriptno"/>
+ <result property="targetid" column="targetid"/>
+ <result property="targetname" column="targetname"/>
+ <result property="targettype" column="targettype"/>
+ <result property="targetoptions" column="targetoptions"/>
</resultMap>
<sql id="selectSvyLibTemplateScriptVo">
select id,
script_type,
+ targetid,
+ targetname,
+ targettype,
+ targetoptions,
scriptid,
branch_flag,
branch_nextscriptno,
@@ -109,7 +117,12 @@
<if test="svyid != null ">and svyid = #{svyid}</if>
<if test="branchFlag != null and branchFlag != ''">and branch_flag = #{branchFlag}</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
- #{branchNextscriptno}</if>
+ #{branchNextscriptno}
+ </if>
+ <if test="targetid != null ">and targetid = #{targetid}</if>
+ <if test="targetname != null and targetname != ''">and targetname = #{targetname}</if>
+ <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
+ <if test="targetoptions != null and targetoptions != ''">and targetoptions = #{targetoptions}</if>
</where>
</select>
@@ -156,6 +169,10 @@
<if test="svyid != null">svyid,</if>
<if test="branchFlag != null and branchFlag != ''">branch_flag,</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno,</if>
+ <if test="targetid != null ">targetid,</if>
+ <if test="targetname != null and targetname != ''">targetname,</if>
+ <if test="targettype != null and targettype != ''">targettype,</if>
+ <if test="targetoptions != null and targetoptions != ''">targetoptions,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nextScriptno != null">#{nextScriptno},</if>
@@ -192,6 +209,10 @@
<if test="svyid != null">#{svyid},</if>
<if test="branchFlag != null and branchFlag != ''">#{branchFlag},</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">#{branchNextscriptno},</if>
+ <if test="targetid != null ">#{targetid},</if>
+ <if test="targetname != null and targetname != ''">#{targetname},</if>
+ <if test="targettype != null and targettype != ''">#{targettype},</if>
+ <if test="targetoptions != null and targetoptions != ''">#{targetoptions},</if>
</trim>
</insert>
@@ -234,6 +255,10 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno =
#{branchNextscriptno},
</if>
+ <if test="targetid != null ">targetid = #{targetid},</if>
+ <if test="targetname != null and targetname != ''">targetname = #{targetname},</if>
+ <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
+ <if test="targetoptions != null and targetoptions != ''">targetoptions = #{targetoptions},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
index 9504d90..753ca27 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
@@ -45,6 +45,7 @@
resultMap="SvyLibTemplateTagResult">
<include refid="selectSvyLibTemplateTagVo"/>
<where>
+ del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="templateid != null ">and templateid = #{templateid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index a8c516e..ec1c80a 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -26,7 +26,7 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="valueType" column="value_type"/>
- <result property="targetOptions" column="targetOptions"/>
+ <result property="targetoptions" column="targetoptions"/>
<result property="scriptType" column="script_type"/>
<result property="targetid" column="targetid"/>
<result property="targetvalue" column="targetvalue"/>
@@ -38,6 +38,8 @@
<result property="scriptTopic" column="script_topic"/>
<result property="branchFlag" column="branch_flag"/>
<result property="branchNextscriptno" column="branch_nextscriptno"/>
+ <result property="targettype" column="targettype"/>
+ <result property="targetname" column="targetname"/>
</resultMap>
@@ -47,11 +49,13 @@
branch_flag,
branch_nextscriptno,
script_desc,
+ targetname,
+ targettype,
taskid,
scriptno,
templateID,
scriptid,
- script_topic, language, categoryName, script_content, is_must, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetOptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
+ script_topic, language, categoryName, script_content, is_must, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
from svy_task_template_script
</sql>
@@ -76,7 +80,7 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="valueType != null ">and value_type = #{valueType}</if>
- <if test="targetOptions != null and targetOptions != ''">and targetOptions = #{targetOptions}</if>
+ <if test="targetoptions != null and targetoptions != ''">and targetoptions = #{targetoptions}</if>
<if test="scriptType != null and scriptType != ''">and script_type = #{scriptType}</if>
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
@@ -86,6 +90,8 @@
<if test="picturePath != null and picturePath != ''">and picture_path = #{picturePath}</if>
<if test="scriptTopic != null and scriptTopic != ''">and script_topic = #{scriptTopic}</if>
<if test="branchFlag != null and branchFlag != ''">and branch_flag = #{branchFlag}</if>
+ <if test="targetname != null and targetname != ''">and targetname = #{branchFtargetnamelag}</if>
+ <if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
@@ -121,7 +127,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="valueType != null">value_type,</if>
- <if test="targetOptions != null">targetOptions,</if>
+ <if test="targetoptions != null">targetoptions,</if>
<if test="scriptType != null">script_type,</if>
<if test="targetid != null">targetid,</if>
<if test="targetvalue != null">targetvalue,</if>
@@ -133,6 +139,8 @@
<if test="scriptTopic != null">script_topic,</if>
<if test="branchFlag != null and branchFlag != ''">branch_flag,</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno,</if>
+ <if test="targetname != null and targetname != ''">targetname,</if>
+ <if test="targettype != null and targettype != ''">targettype,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskid != null">#{taskid},</if>
@@ -155,7 +163,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="valueType != null">#{valueType},</if>
- <if test="targetOptions != null">#{targetOptions},</if>
+ <if test="targetoptions != null">#{targetoptions},</if>
<if test="scriptType != null">#{scriptType},</if>
<if test="targetid != null">#{targetid},</if>
<if test="targetvalue != null">#{targetvalue},</if>
@@ -167,6 +175,8 @@
<if test="scriptTopic != null">#{scriptTopic},</if>
<if test="branchFlag != null and branchFlag != ''">#{branchFlag},</if>
<if test="branchNextscriptno != null and branchNextscriptno != ''">#{branchNextscriptno},</if>
+ <if test="targetname != null and targetname != ''">#{branchFtargetnamelag},</if>
+ <if test="targettype != null and targettype != ''">#{targettype},</if>
</trim>
</insert>
@@ -193,7 +203,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="valueType != null">value_type = #{valueType},</if>
- <if test="targetOptions != null">targetOptions = #{targetOptions},</if>
+ <if test="targetoptions != null">targetoptions = #{targetoptions},</if>
<if test="scriptType != null">script_type = #{scriptType},</if>
<if test="targetid != null">targetid = #{targetid},</if>
<if test="targetvalue != null">targetvalue = #{targetvalue},</if>
@@ -207,6 +217,8 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">branch_nextscriptno =
#{branchNextscriptno},
</if>
+ <if test="targetname != null and targetname != ''">targetname = #{branchFtargetnamelag},</if>
+ <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
</trim>
where id = #{d}
</update>
--
Gitblit v1.9.3