From 633f5ba20c9bd6fd1c154914a725fb1c3bf47376 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期三, 22 三月 2023 13:54:23 +0800 Subject: [PATCH] yxh --- smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml | 12 +++--- smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml | 12 +++--- smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 12 +++--- smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java | 15 ++++++- smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java | 14 ++++++ smartor/src/main/java/com/smartor/domain/IvrLibaScript.java | 15 +++++++ smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java | 17 +++++++- smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml | 12 +++-- 8 files changed, 79 insertions(+), 30 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java index 0d45509..c918337 100644 --- a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java +++ b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java @@ -27,7 +27,9 @@ /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String language; - + /** $column.columnComment */ + @Excel(name = "${note}", readConverterExp = "$column.readConverterExp()") + private String note; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long version; @@ -102,6 +104,15 @@ public String getLanguage() { return language; + } + public void setNote(String note) + { + this.note = note; + } + + public String getNote() + { + return note; } public void setVersion(Long version) { @@ -218,7 +229,7 @@ .append("subModuleID", getSubModuleID()) .append("subModuleName", getSubModuleName()) .append("language", getLanguage()) - .append("description", getDescription()) + .append("note", getNote()) .append("version", getVersion()) .append("isEnable", getIsEnable()) .append("isDel", getIsDel()) diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java index baf10b3..4950879 100644 --- a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java +++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java @@ -79,6 +79,9 @@ /** */ @Excel(name = " ") private String language; + /** */ + @Excel(name = " ") + private String note; /** */ @Excel(name = " ") @@ -274,6 +277,15 @@ { return language; } + public void setNote(String note) + { + this.note = note; + } + + public String getNote() + { + return note; + } public void setVersion(Long version) { this.version = version; @@ -383,6 +395,7 @@ return orgid; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -402,7 +415,7 @@ .append("categoryname", getCategoryname()) .append("targetoptions", getTargetoptions()) .append("language", getLanguage()) - .append("description", getDescription()) + .append("note", getNote()) .append("version", getVersion()) .append("isenable", getIsenable()) .append("isdel", getIsdel()) diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java index 458cb7d..492ddf9 100644 --- a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java +++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java @@ -35,6 +35,9 @@ /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String targetRegex; + /** $column.columnComment */ + @Excel(name = "${note}", readConverterExp = "$column.readConverterExp()") + private String note; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @@ -144,6 +147,15 @@ public String getTargetRegex() { return targetRegex; + } + public void setNote(String note) + { + this.note = note; + } + + public String getNote() + { + return note; } public void setLanguage(String language) { @@ -298,7 +310,7 @@ .append("categoryName", getCategoryName()) .append("targetValue", getTargetValue()) .append("targetRegex", getTargetRegex()) - .append("description", getDescription()) + .append("note", getNote()) .append("language", getLanguage()) .append("version", getVersion()) .append("isEnable", getIsEnable()) diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java index 916fa7c..74fc1ba 100644 --- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java +++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java @@ -47,7 +47,9 @@ /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String language; - + /** $column.columnComment */ + @Excel(name = "${note}", readConverterExp = "$column.readConverterExp()") + private String note; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long isEnable; @@ -196,7 +198,16 @@ this.language = language; } - public String getLanguage() + public String getNote() + { + return note; + } + public void setNote(String note) + { + this.note = note; + } + + public String getLanguage() { return language; } @@ -392,7 +403,7 @@ .append("firstQuestionNum", getFirstQuestionNum()) .append("submodule", getSubmodule()) .append("language", getLanguage()) - .append("description", getDescription()) + .append("note", getNote()) .append("isEnable", getIsEnable()) .append("isDel", getIsDel()) .append("addUserID", getAddUserID()) diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml index f81e4d1..b5c6cae 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml @@ -8,7 +8,7 @@ <result property="subModuleID" column="subModuleID" /> <result property="subModuleName" column="subModuleName" /> <result property="language" column="language" /> - <result property="description" column="description" /> + <result property="note" column="note" /> <result property="version" column="version" /> <result property="isEnable" column="isEnable" /> <result property="isDel" column="isDel" /> @@ -28,7 +28,7 @@ </resultMap> <sql id="selectIvrLibaExtemplateVo"> - select subModuleID, subModuleName, language, description, version, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, GroupID, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_extemplate + select subModuleID, subModuleName, language, note, version, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, GroupID, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_extemplate </sql> <select id="selectIvrLibaExtemplateList" parameterType="IvrLibaExtemplate" resultMap="IvrLibaExtemplateResult"> @@ -36,7 +36,7 @@ <where> <if test="subModuleName != null and subModuleName != ''"> and subModuleName like concat('%', #{subModuleName}, '%')</if> <if test="language != null and language != ''"> and language = #{language}</if> - <if test="description != null and description != ''"> and description = #{description}</if> + <if test="note != null and note != ''"> and note = #{note}</if> <if test="version != null "> and version = #{version}</if> <if test="isEnable != null "> and isEnable = #{isEnable}</if> <if test="isDel != null "> and isDel = #{isDel}</if> @@ -62,7 +62,7 @@ <if test="subModuleID != null">subModuleID,</if> <if test="subModuleName != null and subModuleName != ''">subModuleName,</if> <if test="language != null and language != ''">language,</if> - <if test="description != null">description,</if> + <if test="note != null">note,</if> <if test="version != null">version,</if> <if test="isEnable != null">isEnable,</if> <if test="isDel != null">isDel,</if> @@ -84,7 +84,7 @@ <if test="subModuleID != null">#{subModuleID},</if> <if test="subModuleName != null and subModuleName != ''">#{subModuleName},</if> <if test="language != null and language != ''">#{language},</if> - <if test="description != null">#{description},</if> + <if test="note != null">#{note},</if> <if test="version != null">#{version},</if> <if test="isEnable != null">#{isEnable},</if> <if test="isDel != null">#{isDel},</if> @@ -109,7 +109,7 @@ <trim prefix="SET" suffixOverrides=","> <if test="subModuleName != null and subModuleName != ''">subModuleName = #{subModuleName},</if> <if test="language != null and language != ''">language = #{language},</if> - <if test="description != null">description = #{description},</if> + <if test="note != null">note = #{note},</if> <if test="version != null">version = #{version},</if> <if test="isEnable != null">isEnable = #{isEnable},</if> <if test="isDel != null">isDel = #{isDel},</if> diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml index d794907..8f72e05 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml @@ -21,7 +21,7 @@ <result property="categoryname" column="categoryname" /> <result property="targetoptions" column="targetoptions" /> <result property="language" column="language" /> - <result property="description" column="description" /> + <result property="note" column="note" /> <result property="version" column="version" /> <result property="isenable" column="isenable" /> <result property="isdel" column="isdel" /> @@ -41,7 +41,7 @@ </resultMap> <sql id="selectIvrLibaScriptVo"> - select questionid, questionpoint, questiontext, questionvoice, nomatchtext, nomatchvoice, sliencetext, sliencevoice, submoduletext, submodulevoice, noclearlytext, noclearlyvoice, questiontype, categoryname, targetoptions, language, description, version, isenable, isdel, adduserid, addtime, modifyuserid, modifytime, groupid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_script + select questionid, questionpoint, questiontext, questionvoice, nomatchtext, nomatchvoice, sliencetext, sliencevoice, submoduletext, submodulevoice, noclearlytext, noclearlyvoice, questiontype, categoryname, targetoptions, language, note, version, isenable, isdel, adduserid, addtime, modifyuserid, modifytime, groupid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_script </sql> <select id="selectIvrLibaScriptList" parameterType="IvrLibaScript" resultMap="IvrLibaScriptResult"> @@ -62,6 +62,8 @@ <if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if> <if test="targetoptions != null and targetoptions != ''"> and targetoptions = #{targetoptions}</if> <if test="language != null and language != ''"> and language = #{language}</if> + + <if test="note != null and note != ''"> and note = #{note}</if> <if test="version != null "> and version = #{version}</if> <if test="isenable != null "> and isenable = #{isenable}</if> <if test="isdel != null "> and isdel = #{isdel}</if> @@ -100,7 +102,7 @@ <if test="categoryname != null">categoryname,</if> <if test="targetoptions != null">targetoptions,</if> <if test="language != null">language,</if> - <if test="description != null">description,</if> + <if test="note != null">note,</if> <if test="version != null">version,</if> <if test="isenable != null">isenable,</if> <if test="isdel != null">isdel,</if> @@ -135,7 +137,7 @@ <if test="categoryname != null">#{categoryname},</if> <if test="targetoptions != null">#{targetoptions},</if> <if test="language != null">#{language},</if> - <if test="description != null">#{description},</if> + <if test="note != null">#{note},</if> <if test="version != null">#{version},</if> <if test="isenable != null">#{isenable},</if> <if test="isdel != null">#{isdel},</if> @@ -173,7 +175,7 @@ <if test="categoryname != null">categoryname = #{categoryname},</if> <if test="targetoptions != null">targetoptions = #{targetoptions},</if> <if test="language != null">language = #{language},</if> - <if test="description != null">description = #{description},</if> + <if test="note != null">note = #{note},</if> <if test="version != null">version = #{version},</if> <if test="isenable != null">isenable = #{isenable},</if> <if test="isdel != null">isdel = #{isdel},</if> diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml index 6c8d1e9..932720a 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml @@ -10,7 +10,7 @@ <result property="categoryName" column="categoryName" /> <result property="targetValue" column="targetValue" /> <result property="targetRegex" column="targetRegex" /> - <result property="description" column="description" /> + <result property="note" column="note" /> <result property="language" column="language" /> <result property="version" column="version" /> <result property="isEnable" column="isEnable" /> @@ -34,7 +34,7 @@ </resultMap> <sql id="selectIvrLibaTargetVo"> - select targetID, targetType, categoryName, targetValue, targetRegex, description, language, version, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, isAbnormal, WarnUp, WarnDown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_target + select targetID, targetType, categoryName, targetValue, targetRegex, note, language, version, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, isAbnormal, WarnUp, WarnDown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_target </sql> <select id="selectIvrLibaTargetList" parameterType="IvrLibaTarget" resultMap="IvrLibaTargetResult"> @@ -44,7 +44,7 @@ <if test="categoryName != null and categoryName != ''"> and categoryName like concat('%', #{categoryName}, '%')</if> <if test="targetValue != null and targetValue != ''"> and targetValue = #{targetValue}</if> <if test="targetRegex != null and targetRegex != ''"> and targetRegex = #{targetRegex}</if> - <if test="description != null and description != ''"> and description = #{description}</if> + <if test="note != null and note != ''"> and note = #{note}</if> <if test="language != null and language != ''"> and language = #{language}</if> <if test="version != null "> and version = #{version}</if> <if test="isEnable != null "> and isEnable = #{isEnable}</if> @@ -76,7 +76,7 @@ <if test="categoryName != null and categoryName != ''">categoryName,</if> <if test="targetValue != null">targetValue,</if> <if test="targetRegex != null">targetRegex,</if> - <if test="description != null">description,</if> + <if test="note != null">note,</if> <if test="language != null and language != ''">language,</if> <if test="version != null">version,</if> <if test="isEnable != null">isEnable,</if> @@ -104,7 +104,7 @@ <if test="categoryName != null and categoryName != ''">#{categoryName},</if> <if test="targetValue != null">#{targetValue},</if> <if test="targetRegex != null">#{targetRegex},</if> - <if test="description != null">#{description},</if> + <if test="note != null">#{note},</if> <if test="language != null and language != ''">#{language},</if> <if test="version != null">#{version},</if> <if test="isEnable != null">#{isEnable},</if> @@ -135,7 +135,7 @@ <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if> <if test="targetValue != null">targetValue = #{targetValue},</if> <if test="targetRegex != null">targetRegex = #{targetRegex},</if> - <if test="description != null">description = #{description},</if> + <if test="note != null">note = #{note},</if> <if test="language != null and language != ''">language = #{language},</if> <if test="version != null">version = #{version},</if> <if test="isEnable != null">isEnable = #{isEnable},</if> diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml index 625f066..809d63e 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml @@ -13,7 +13,7 @@ <result property="firstQuestionNum" column="firstQuestionNum" /> <result property="submodule" column="submodule" /> <result property="language" column="language" /> - <result property="description" column="description" /> + <result property="note" column="note" /> <result property="isEnable" column="isEnable" /> <result property="isDel" column="isDel" /> <result property="addUserID" column="addUserID" /> @@ -41,7 +41,7 @@ </resultMap> <sql id="selectIvrLibaTemplateVo"> - select templateID, templateName, silencetime, slienceRepeatTimes, nomatchRepeatTimes, firstQuestionNum, submodule, language, description, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, labelInfo, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, DeptIds, DeptNames, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_template + select templateID, templateName, silencetime, slienceRepeatTimes, nomatchRepeatTimes, firstQuestionNum, submodule, language, note, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, labelInfo, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, DeptIds, DeptNames, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_template </sql> <select id="selectIvrLibaTemplateList" parameterType="IvrLibaTemplate" resultMap="IvrLibaTemplateResult"> @@ -54,7 +54,7 @@ <if test="firstQuestionNum != null "> and firstQuestionNum = #{firstQuestionNum}</if> <if test="submodule != null and submodule != ''"> and submodule = #{submodule}</if> <if test="language != null and language != ''"> and language = #{language}</if> - <if test="description != null and description != ''"> and description = #{description}</if> + <if test="note != null and note != ''"> and note = #{note}</if> <if test="isEnable != null "> and isEnable = #{isEnable}</if> <if test="isDel != null "> and isDel = #{isDel}</if> <if test="addUserID != null and addUserID != ''"> and addUserID = #{addUserID}</if> @@ -93,7 +93,7 @@ <if test="firstQuestionNum != null">firstQuestionNum,</if> <if test="submodule != null">submodule,</if> <if test="language != null and language != ''">language,</if> - <if test="description != null">description,</if> + <if test="note != null">note,</if> <if test="isEnable != null">isEnable,</if> <if test="isDel != null">isDel,</if> <if test="addUserID != null">addUserID,</if> @@ -128,7 +128,7 @@ <if test="firstQuestionNum != null">#{firstQuestionNum},</if> <if test="submodule != null">#{submodule},</if> <if test="language != null and language != ''">#{language},</if> - <if test="description != null">#{description},</if> + <if test="note != null">#{note},</if> <if test="isEnable != null">#{isEnable},</if> <if test="isDel != null">#{isDel},</if> <if test="addUserID != null">#{addUserID},</if> @@ -166,7 +166,7 @@ <if test="firstQuestionNum != null">firstQuestionNum = #{firstQuestionNum},</if> <if test="submodule != null">submodule = #{submodule},</if> <if test="language != null and language != ''">language = #{language},</if> - <if test="description != null">description = #{description},</if> + <if test="note != null">note = #{note},</if> <if test="isEnable != null">isEnable = #{isEnable},</if> <if test="isDel != null">isDel = #{isDel},</if> <if test="addUserID != null">addUserID = #{addUserID},</if> -- Gitblit v1.9.3