liusheng
2024-07-06 ebf745653041ac8da2d365e3c80c92b273c2bbc4
代码提交
已修改19个文件
497 ■■■■ 文件已修改
smartor/src/main/java/com/smartor/domain/IvrLibaScript.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyLibScript.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
@@ -33,21 +33,28 @@
     */
    @ApiModelProperty("问题话术标题")
    @Excel(name = "问题话术标题")
    private String questiontitle;
    private String scriptTopic;
    /**
     * 话术内容
     */
    @ApiModelProperty("话术内容")
    @Excel(name = "话术内容")
    private String questionText;
    private String scriptContent;
    /**
     * 话术描述
     */
    @ApiModelProperty("话术描述")
    @Excel(name = "话术描述")
    private String scriptDesc;
    /**
     * 话术语音
     */
    @ApiModelProperty("话术语音")
    @Excel(name = "话术语音")
    private String questionvoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -110,7 +117,7 @@
     */
    @ApiModelProperty("问题类型")
    @Excel(name = "问题类型 ")
    private String questiontype;
    private String scriptType;
    /**
     * 对应的ivr_liba_target表的主键
smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
@@ -48,21 +48,28 @@
     */
    @ApiModelProperty("问题话术标题")
    @Excel(name = "问题话术标题")
    private String questiontitle;
    private String scriptTopic;
    /**
     * 话术内容
     */
    @ApiModelProperty("话术内容")
    @Excel(name = "话术内容")
    private String questionText;
    private String scriptContent;
    /**
     * 话术描述
     */
    @ApiModelProperty("话术描述")
    @Excel(name = "话术描述")
    private String scriptDesc;
    /**
     * 话术语音
     */
    @ApiModelProperty("话术语音")
    @Excel(name = "话术语音")
    private String questionvoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -125,7 +132,7 @@
     */
    @ApiModelProperty("问题类型")
    @Excel(name = "问题类型 ")
    private String questiontype;
    private String scriptType;
    /**
     * 对应的ivr_liba_target表的主键
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
@@ -18,7 +18,7 @@
 * @date 2023-12-23
 */
@Data
@ApiModel(value = "IvrLibaTemplateAssort", description = "模板分类对象")
@ApiModel(value = "IvrLibaTemplateScript", description = "模板分类对象")
public class IvrLibaTemplateScript extends BaseEntity {
    private static final long serialVersionUID = 1L;
@@ -33,7 +33,7 @@
     */
    @Excel(name = "模板话术编号")
    @ApiModelProperty(value = "模板话术编号")
    private Long templateQuestionNum;
    private Long scriptno;
    /**
     * 模板ID
@@ -53,21 +53,28 @@
     */
    @Excel(name = "问题点")
    @ApiModelProperty(value = "问题点")
    private String questionPoint;
    private String scriptPoint;
    /**
     * 话术内容
     */
    @Excel(name = "话术内容")
    @ApiModelProperty(value = "话术内容")
    private String questionText;
    private String scriptContent;
    /*
     * 话术描述
     */
    @Excel(name = "话术描述")
    @ApiModelProperty(value = "话术描述")
    private String scriptDesc;
    /**
     * 话术语音
     */
    @Excel(name = "话术语音")
    @ApiModelProperty(value = "话术语音")
    private String questionVoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -207,7 +214,7 @@
     */
    @Excel(name = "标题")
    @ApiModelProperty(value = "标题")
    private String questiontitle;
    private String scriptTopic;
    /**
     * 是否存在操作:1 新增 2修改 3删除
@@ -225,7 +232,7 @@
     * 下一题
     */
    @ApiModelProperty(value = "下一题")
    private Integer nextQuestion;
    private Integer nextScriptno;
    /**
     * 是否存在操作:1 新增 2修改 3删除
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
@@ -33,7 +33,7 @@
     */
    @Excel(name = "模板话术编号")
    @ApiModelProperty(value = "模板话术编号")
    private Long templateQuestionNum;
    private Long scriptno;
    /**
     * 模板ID
@@ -53,21 +53,28 @@
     */
    @Excel(name = "问题点")
    @ApiModelProperty(value = "问题点")
    private String questionPoint;
    private String scriptPoint;
    /**
     * 话术内容
     */
    @Excel(name = "话术内容")
    @ApiModelProperty(value = "话术内容")
    private String questionText;
    private String scriptConten;
    /**
     * 话术描述
     */
    @Excel(name = "话术描述")
    @ApiModelProperty(value = "话术描述")
    private String scriptDesc;
    /**
     * 话术语音
     */
    @Excel(name = "话术语音")
    @ApiModelProperty(value = "话术语音")
    private String questionVoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -232,13 +239,13 @@
     */
    @Excel(name = "标题")
    @ApiModelProperty(value = "标题")
    private String questiontitle;
    private String scriptTopic;
    /**
     * 下一题
     */
    @ApiModelProperty(value = "下一题")
    private Integer nextQuestion;
    private Integer nextScriptno;
    /**
     * 标签
smartor/src/main/java/com/smartor/domain/SvyLibScript.java
@@ -64,7 +64,7 @@
     */
    @Excel(name = " 题目 ")
    @ApiModelProperty("题目")
    private String script;
    private String scriptDesc;
    /**
     * 题目
     */
@@ -183,7 +183,7 @@
    private String icd10Name;
    @ApiModelProperty(value = "问题主题")
    private String topic;
    private String scriptTopic;
    @ApiModelProperty(value = "适用疾病(数组)")
    private List<String> icd10NameList;
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
@@ -157,7 +157,7 @@
     * 问卷题目集合
     */
    @ApiModelProperty(value = "问卷题目集合")
    private List<SvyLibTemplateScript> svyLibScripts;
    private List<SvyLibTemplateScript> svyTemplateLibScripts;
    /**
     * 模板科室关联集合
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java
@@ -29,19 +29,6 @@
    @ApiModelProperty("自增ID")
    private Long id;
    /**
     * 老版本ID
     */
    @Excel(name = " 老版本ID ")
    @ApiModelProperty("老版本ID")
    private Long oldid;
    /**
     * 问卷ID
     */
    @Excel(name = " 问卷模板ID ")
    @ApiModelProperty("问卷模板ID")
    private Long svyid;
    /**
     * 题目类型;枚举 1.单选 2多选 3填空 4其它
@@ -55,7 +42,14 @@
     */
    @Excel(name = " 题目Code ")
    @ApiModelProperty("题目Code")
    private String seqno;
    private String scriptno;
    /**
     * 下一个问题编号
     */
    @Excel(name = " 下一个问题编号 ")
    @ApiModelProperty("下一个问题编号")
    private String nextScriptno;
    /**
     * 是否存在操作:1 新增 2修改 3删除
@@ -126,11 +120,6 @@
    @ApiModelProperty("上传时间")
    private Date uploadTime;
    /**
     * 废弃
     */
    @ApiModelProperty("(废弃)")
    private Long svyTopicid;
    /**
     * 父ID
@@ -237,4 +226,11 @@
    @ApiModelProperty("题目主题")
    private String scriptTopic;
    /**
     * svy_lib_script题目id
     */
    @Excel(name = "svy_lib_script题目id")
    @ApiModelProperty("svy_lib_script题目id")
    private Long scriptid;
}
smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java
@@ -29,18 +29,19 @@
    private Long id;
    /**
     * 老版本ID
     * 下一个问题编号
     */
    @Excel(name = " 老版本ID ")
    @ApiModelProperty("老版本ID")
    private Long oldid;
    @Excel(name = " 下一个问题编号 ")
    @ApiModelProperty("下一个问题编号")
    private String nextScriptno;
    /**
     * 问卷ID
     * svy_lib_script题目id
     */
    @Excel(name = " 问卷模板ID ")
    @ApiModelProperty("问卷模板ID")
    private Long svyid;
    @Excel(name = "svy_lib_script题目id")
    @ApiModelProperty("svy_lib_script题目id")
    private Long scriptid;
    /**
     * 题目类型;枚举 1.单选 2多选 3填空 4其它
@@ -54,7 +55,7 @@
     */
    @Excel(name = " 题目Code ")
    @ApiModelProperty("题目Code")
    private String seqno;
    private String scriptno;
    /**
     * 是否存在操作:1 新增 2修改 3删除
@@ -124,12 +125,6 @@
    @Excel(name = " 上传时间 ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty("上传时间")
    private Date uploadTime;
    /**
     * 废弃
     */
    @ApiModelProperty("(废弃)")
    private Long svyTopicid;
    /**
     * 父ID
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScript.java
@@ -35,7 +35,7 @@
     * 模板话术编号
     */
    @ApiModelProperty(value = "模板话术编号")
    private Long templateQuestionNum;
    private Long scriptno;
    /**
     * 模板ID
@@ -47,13 +47,13 @@
     * 话术ID
     */
    @ApiModelProperty(value = "话术ID")
    private Long scriptID;
    private Long scriptid;
    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String questiontitle;
    private String scriptDesc;
    /**
     * 语言
@@ -71,19 +71,19 @@
     * 问题点
     */
    @ApiModelProperty(value = "问题点")
    private String questionPoint;
    private String scriptPoint;
    /**
     * 话术内容
     */
    @ApiModelProperty(value = "话术内容")
    private String questionText;
    private String scriptContent;
    /**
     * 话术语音
     */
    @ApiModelProperty(value = "话术语音")
    private String questionVoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -227,13 +227,13 @@
     * 下一话术编号
     */
    @ApiModelProperty(value = "下一话术编号")
    private Long nextQuestion;
    private Long nextScriptno;
    /**
     * 问题结果(给“值类型”是文本或者数值用的)*
     */
    @ApiModelProperty(value = "问题结果")
    private String questionResult;
    private String scriptResult;
    /**
     * 变量参数集合
@@ -253,6 +253,6 @@
     */
    @Excel(name = "题目主题")
    @ApiModelProperty("题目主题")
    private String topic;
    private String scriptTopic;
}
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
@@ -32,7 +32,7 @@
     */
    @Excel(name = "题目主题")
    @ApiModelProperty("题目主题")
    private String topic;
    private String scriptTopic;
    /**
     * 任务id
@@ -44,7 +44,7 @@
     * 模板话术编号
     */
    @ApiModelProperty(value = "模板话术编号")
    private Long templateQuestionNum;
    private Long scriptno;
    /**
     * 模板ID
@@ -56,13 +56,13 @@
     * 话术ID
     */
    @ApiModelProperty(value = "话术ID")
    private Long scriptID;
    private Long scriptid;
    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String questiontitle;
    private String script_title;
    /**
     * 语言
@@ -80,19 +80,19 @@
     * 问题点
     */
    @ApiModelProperty(value = "问题点")
    private String questionPoint;
    private String scriptPoint;
    /**
     * 话术内容
     */
    @ApiModelProperty(value = "话术内容")
    private String questionText;
    private String scriptContent;
    /**
     * 话术语音
     */
    @ApiModelProperty(value = "话术语音")
    private String questionVoice;
    private String scriptVoice;
    /**
     * 无匹配话术
@@ -224,13 +224,13 @@
     * 下一话术编号
     */
    @ApiModelProperty(value = "下一话术编号")
    private Long nextQuestion;
    private Long nextScriptno;
    /**
     * 问题结果(给“值类型”是文本或者数值用的)*
     */
    @ApiModelProperty(value = "问题结果 ,给=“值类型”是文本或者数值用的")
    private String questionResult;
    private String scriptResult;
    /**
     * 变量参数集合
smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java
@@ -160,7 +160,7 @@
                    }
                    svyLibTopic.setScriptcode(IdUtils.simpleUUID());
                    svyLibTopic.setScript(legend);
                    svyLibTopic.setScriptContent(legend);
                    svyLibTopic.setDelFlag("0");
                    svyLibTopic.setIsupload(0L);
                    svyLibTopic.setOrgid(fileName);
@@ -201,14 +201,12 @@
                } else {
                    //将题目保存到表中
                    Elements elementsByClass2 = element.getElementsByClass("ui-control-group ui-matrix");
                    if (elementsByClass2.size() > 0) {
                        SvyLibScript svyLibTopic2 = new SvyLibScript();
                        svyLibTopic2.setSvyid(svyLibTitle.getSvyid());
                        svyLibTopic2.setScriptcode(IdUtils.simpleUUID());
                        svyLibTopic2.setScript(legend);
                        svyLibTopic2.setScriptContent(legend);
                        svyLibTopic2.setDelFlag("0");
                        svyLibTopic.setIsupload(0L);
                        svyLibTopic2.setScripttype("4");
@@ -243,7 +241,7 @@
                        SvyLibScript svyLibTopic3 = new SvyLibScript();
                        svyLibTopic3.setSvyid(svyLibTitle.getSvyid());
                        svyLibTopic3.setScriptcode(IdUtils.simpleUUID());
                        svyLibTopic3.setScript(legend);
                        svyLibTopic3.setScriptContent(legend);
                        svyLibTopic3.setDelFlag("0");
                        svyLibTopic3.setIsupload(0L);
                        svyLibTopic3.setScripttype("3");
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -199,17 +199,17 @@
        //将模板问题话术里的通配符替换
        for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOS) {
            if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getQuestionText())) {
            if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptConten())) {
                for (Map<String, String> map : mapList) {
                    for (String key : map.keySet()) {
                        ivrLibaTemplateScriptVO.setQuestionText(ivrLibaTemplateScriptVO.getQuestionText().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
                        ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
                    }
                }
                //替换患者个人信息数据
                ivrLibaTemplateScriptVO.setQuestionText(ivrLibaTemplateScriptVO.getQuestionText().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
                ivrLibaTemplateScriptVO.setQuestionText(ivrLibaTemplateScriptVO.getQuestionText().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
                ivrLibaTemplateScriptVO.setQuestionText(ivrLibaTemplateScriptVO.getQuestionText().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
                ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
                ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
                ivrLibaTemplateScriptVO.setScriptConten(ivrLibaTemplateScriptVO.getScriptConten().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
                //获取问题选项
                IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
@@ -231,7 +231,7 @@
    private List wjInfo(ServiceTask serviceTask, Long patid) {
        //通过模板ID获取问题信息
        SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
        svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getTemplateid()));
        svyLibTemplateScript.setId(Long.valueOf(serviceTask.getTemplateid()));
        svyLibTemplateScript.setDelFlag("0");
        List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        if (CollectionUtils.isEmpty(svyLibTemplateScripts) || svyLibTemplateScripts.size() == 0) {
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -64,7 +64,7 @@
//            svyLibScript.setSvyid(svyLibTemplates.get(i).getSvyid());
//            List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibScript);
            SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
            svyLibTemplateScript.setSvyid(svyLibTemplates.get(i).getSvyid());
            svyLibTemplateScript.setId(svyLibTemplates.get(i).getSvyid());
            List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
            //获取题目选项
            a:
@@ -82,7 +82,7 @@
                }
            }
            //将题目放到问卷列表中
            svyLibTemplates.get(i).setSvyLibScripts(svyLibTemplateScripts);
            svyLibTemplates.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);
            //获取每个问卷对应的科室
            TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
@@ -161,8 +161,8 @@
        i = svyLibTemplate.getSvyid().intValue();
        //处理题目
        if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
            for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
        if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyTemplateLibScripts())) {
            for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyTemplateLibScripts()) {
                //对题目进行处理
                if (svyLibScript.getIsoperation() != null) {
                    //问题的操作不为空
@@ -242,14 +242,14 @@
    private void scriptHandle(Long svyid, SvyLibTemplateScript svyLibScript, Integer isoperation) {
        if (isoperation == 1) {
            //新增
            svyLibScript.setSvyid(svyid);
            svyLibScript.setId(svyid);
            svyLibScript.setId(null);
            svyLibScript.setCreateTime(new Date());
            svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
        } else if (isoperation == 2) {
            //修改
            svyLibScript.setSvyid(svyid);
            svyLibScript.setId(svyid);
            svyLibScript.setUpdateTime(new Date());
            svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
        } else if (isoperation == 3) {
smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
@@ -117,7 +117,7 @@
        //通过模板ID获取问题信息
        SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
        svyLibTemplateScript.setSvyid(Long.valueOf(svyTask.getTemplateid()));
        svyLibTemplateScript.setId(Long.valueOf(svyTask.getTemplateid()));
        svyLibTemplateScript.setDelFlag("0");
        List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        if (CollectionUtils.isEmpty(svyLibTemplateScripts) || svyLibTemplateScripts.size() == 0) {
smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -6,9 +6,10 @@
    <resultMap type="com.smartor.domain.IvrLibaScript" id="IvrLibaScriptResult">
        <result property="id" column="id"/>
        <result property="questiontitle" column="questiontitle"/>
        <result property="questionText" column="questionText"/>
        <result property="questionvoice" column="questionvoice"/>
        <result property="scriptTopic" column="script_topic"/>
        <result property="scriptContent" column="script_content"/>
        <result property="scriptVoice" column="script_voice"/>
        <result property="scriptDesc" column="script_desc"/>
        <result property="noMatchText" column="nomatchtext"/>
        <result property="nomatchvoice" column="nomatchvoice"/>
        <result property="slienceText" column="sliencetext"/>
@@ -17,7 +18,7 @@
        <result property="submodulevoice" column="submodulevoice"/>
        <result property="noClearlyText" column="noclearlytext"/>
        <result property="noclearlyvoice" column="noclearlyvoice"/>
        <result property="questiontype" column="questiontype"/>
        <result property="scriptType" column="script_type"/>
        <result property="targetid" column="targetid"/>
        <result property="targetname" column="targetname"/>
        <result property="targetoptions" column="targetoptions"/>
@@ -59,12 +60,13 @@
               campus,
               deptNames,
               deptIds,
               questiontitle,
               script_topic,
               value_type,
               reply,
               isAvailable,
               questionText,
               questionvoice,
               script_content,
               script_desc,
               script_voice,
               nomatchtext,
               nomatchvoice,
               sliencetext,
@@ -73,7 +75,7 @@
               submodulevoice,
               noclearlytext,
               noclearlyvoice,
               questiontype,
               script_type,
               targetid,
               targetname,
               tag,
@@ -88,14 +90,15 @@
            <if test="id != null ">and id = #{id}</if>
            <if test="deptIds != null  and deptIds != ''">and deptIds = #{deptIds}</if>
            <if test="deptNames != null  and deptNames != ''">and deptNames like concat('%', #{deptNames}, '%')</if>
            <if test="questiontitle != null  and questiontitle != ''">and questiontitle like concat('%', #{questiontitle}, '%')</if>
            <if test="scriptTopic != null  and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic}, '%')</if>
            <if test="campus != null  and campus != ''">and campus = #{campus}</if>
            <if test="tag != null  and tag != ''">and tag = #{tag}</if>
            <if test="suitway != null  and suitway != ''">and suitway = #{suitway}</if>
            <if test="isAvailable != null  and isAvailable != ''">and isAvailable = #{isAvailable}</if>
            <if test="valueType != null ">and value_type = #{valueType}</if>
            <if test="questionText != null  and questionText != ''">and questionText = #{questionText}</if>
            <if test="questionvoice != null  and questionvoice != ''">and questionvoice = #{questionvoice}</if>
            <if test="scriptContent != null  and scriptContent != ''">and script_content = #{scriptContent}</if>
            <if test="scriptDesc != null  and scriptDesc != ''">and script_desc = #{scriptDesc}</if>
            <if test="scriptVoice != null  and scriptVoice != ''">and script_voice = #{scriptVoice}</if>
            <if test="noMatchText != null  and noMatchText != ''">and nomatchtext = #{noMatchText}</if>
            <if test="nomatchvoice != null  and nomatchvoice != ''">and nomatchvoice = #{nomatchvoice}</if>
            <if test="slienceText != null  and slienceText != ''">and sliencetext = #{slienceText}</if>
@@ -104,7 +107,7 @@
            <if test="submodulevoice != null  and submodulevoice != ''">and submodulevoice = #{submodulevoice}</if>
            <if test="noClearlyText != null  and noClearlyText != ''">and noclearlytext = #{noClearlyText}</if>
            <if test="noclearlyvoice != null  and noclearlyvoice != ''">and noclearlyvoice = #{noclearlyvoice}</if>
            <if test="questiontype != null  and questiontype != ''">and questiontype = #{questiontype}</if>
            <if test="scriptType != null  and scriptType != ''">and script_type = #{scriptType}</if>
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
            <if test="targetoptions != null  and targetoptions != ''">and targetoptions = #{targetoptions}</if>
@@ -134,7 +137,7 @@
            keyProperty="id">
        insert into ivr_liba_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="questiontitle != null">questiontitle,</if>
            <if test="scriptTopic != null">script_topic,</if>
            <if test="suitway != null">suitway,</if>
            <if test="campus != null">campus,</if>
            <if test="deptIds != null">deptIds,</if>
@@ -142,8 +145,9 @@
            <if test="tag != null">tag,</if>
            <if test="isAvailable != null">isAvailable,</if>
            <if test="reply != null">reply,</if>
            <if test="questionText != null">questionText,</if>
            <if test="questionvoice != null">questionvoice,</if>
            <if test="scriptContent != null">script_topic,</if>
            <if test="scriptDesc != null">script_desc,</if>
            <if test="scriptVoice != null">script_voice,</if>
            <if test="noMatchText != null">nomatchtext,</if>
            <if test="nomatchvoice != null">nomatchvoice,</if>
            <if test="slienceText != null">sliencetext,</if>
@@ -152,7 +156,7 @@
            <if test="submodulevoice != null">submodulevoice,</if>
            <if test="noClearlyText != null">noclearlytext,</if>
            <if test="noclearlyvoice != null">noclearlyvoice,</if>
            <if test="questiontype != null">questiontype,</if>
            <if test="scriptType != null">script_type,</if>
            <if test="targetid != null">targetid,</if>
            <if test="targetname != null">targetname,</if>
            <if test="targetoptions != null">targetoptions,</if>
@@ -181,7 +185,7 @@
            <if test="targetdesc != null">targetdesc,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="questiontitle != null">#{questiontitle},</if>
            <if test="scriptTopic != null">#{scriptTopic},</if>
            <if test="suitway != null">#{suitway},</if>
            <if test="campus != null">#{campus},</if>
            <if test="deptIds != null">#{deptIds},</if>
@@ -189,8 +193,9 @@
            <if test="tag != null">#{tag},</if>
            <if test="isAvailable != null">#{isAvailable},</if>
            <if test="reply != null">#{reply},</if>
            <if test="questionText != null">#{questionText},</if>
            <if test="questionvoice != null">#{questionvoice},</if>
            <if test="scriptContent != null">#{scriptContent},</if>
            <if test="scriptDesc != null">#{scriptDesc},</if>
            <if test="scriptVoice != null">#{scriptVoice},</if>
            <if test="noMatchText != null">#{noMatchText},</if>
            <if test="nomatchvoice != null">#{nomatchvoice},</if>
            <if test="slienceText != null">#{slienceText},</if>
@@ -199,7 +204,7 @@
            <if test="submodulevoice != null">#{submodulevoice},</if>
            <if test="noClearlyText != null">#{noClearlyText},</if>
            <if test="noclearlyvoice != null">#{noclearlyvoice},</if>
            <if test="questiontype != null">#{questiontype},</if>
            <if test="scriptType != null">#{scriptType},</if>
            <if test="targetid != null">#{targetid},</if>
            <if test="targetname != null">#{targetname},</if>
            <if test="targetoptions != null">#{targetoptions},</if>
@@ -232,13 +237,14 @@
    <update id="updateIvrLibaScript" parameterType="com.smartor.domain.IvrLibaScript">
        update ivr_liba_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="questiontitle != null">questiontitle = #{questiontitle},</if>
            <if test="scriptTopic != null">script_topic = #{scriptTopic},</if>
            <if test="suitway != null">suitway = #{suitway},</if>
            <if test="isAvailable != null">isAvailable = #{isAvailable},</if>
            <if test="valueType != null">value_type = #{valueType},</if>
            <if test="reply != null">reply = #{reply},</if>
            <if test="questionText != null">questionText = #{questionText},</if>
            <if test="questionvoice != null">questionvoice = #{questionvoice},</if>
            <if test="scriptContent != null">script_content = #{scriptContent},</if>
            <if test="scriptDesc != null">script_desc = #{scriptDesc},</if>
            <if test="scriptVoice != null">script_voice = #{scriptVoice},</if>
            <if test="noMatchText != null">nomatchtext = #{noMatchText},</if>
            <if test="nomatchvoice != null">nomatchvoice = #{nomatchvoice},</if>
            <if test="slienceText != null">sliencetext = #{slienceText},</if>
@@ -247,7 +253,7 @@
            <if test="submodulevoice != null">submodulevoice = #{submodulevoice},</if>
            <if test="noClearlyText != null">noclearlytext = #{noClearlyText},</if>
            <if test="noclearlyvoice != null">noclearlyvoice = #{noclearlyvoice},</if>
            <if test="questiontype != null">questiontype = #{questiontype},</if>
            <if test="scriptType != null">script_type = #{scriptType},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="targetname != null">targetname = #{targetname},</if>
            <if test="targetoptions != null">targetoptions = #{targetoptions},</if>
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -6,12 +6,13 @@
    <resultMap type="com.smartor.domain.IvrLibaTemplateScript" id="IvrLibaTemplateScriptResult">
        <result property="ID" column="ID"/>
        <result property="templateQuestionNum" column="templateQuestionNum"/>
        <result property="scriptno" column="scriptno"/>
        <result property="templateID" column="templateID"/>
        <result property="scriptid" column="scriptID"/>
        <result property="questionPoint" column="questionPoint"/>
        <result property="questionText" column="questionText"/>
        <result property="questionVoice" column="questionVoice"/>
        <result property="scriptPoint" column="script_point"/>
        <result property="scriptContent" column="script_content"/>
        <result property="scriptDesc" column="script_content"/>
        <result property="scriptVoice" column="script_voice"/>
        <result property="noMatchText" column="noMatchText"/>
        <result property="noMatchVoice" column="noMatchVoice"/>
        <result property="slienceText" column="slienceText"/>
@@ -35,20 +36,22 @@
        <result property="guid" column="guid"/>
        <result property="targetid" column="targetid"/>
        <result property="targetvalue" column="targettalue"/>
        <result property="questiontitle" column="questiontitle"/>
        <result property="nextQuestion" column="next_question"/>
        <result property="scriptTopic" column="script_topic"/>
        <result property="nextScriptno" column="next_scriptno"/>
        <result property="otherdata" column="otherdata"/>
        <result property="isMust" column="is_must"/>
        <result property="scriptDesc" column="script_desc"/>
    </resultMap>
    <sql id="selectIvrLibaTemplateScriptVo">
        select ID,
               templateQuestionNum,
               scriptno,
               templateID,
               scriptID,
               questionPoint,
               questionText,
               questionVoice,
               script_point,
               scrpt_content,
               script_desc,
               script_voice,
               noMatchText,
               noMatchVoice,
               slienceText,
@@ -61,8 +64,8 @@
               targetid,
               value_type,
               targetvalue,
               questiontitle,
               next_question,
               script_topic,
               next_scriptno,
               otherdata,
               is_must,
               playWavOnly,
@@ -84,11 +87,12 @@
        <include refid="selectIvrLibaTemplateScriptVo"/>
        <where>
            del_flag=0
            <if test="templateQuestionNum != null ">and templateQuestionNum = #{templateQuestionNum}</if>
            <if test="scriptno != null ">and scriptno = #{scriptno}</if>
            <if test="scriptDesc != null ">and script_desc = #{scriptDesc}</if>
            <if test="templateID != null ">and templateID = #{templateID}</if>
            <if test="questionPoint != null  and questionPoint != ''">and questionPoint = #{questionPoint}</if>
            <if test="questionText != null  and questionText != ''">and questionText = #{questionText}</if>
            <if test="questionVoice != null  and questionVoice != ''">and questionVoice = #{questionVoice}</if>
            <if test="scriptPoint != null  and scriptPoint != ''">and script_point = #{scriptPoint}</if>
            <if test="scriptContent != null  and scriptContent != ''">and script_content = #{scriptContent}</if>
            <if test="scriptVoice != null  and scriptVoice != ''">and script_voice = #{scriptVoice}</if>
            <if test="noMatchText != null  and noMatchText != ''">and noMatchText = #{noMatchText}</if>
            <if test="noMatchVoice != null  and noMatchVoice != ''">and noMatchVoice = #{noMatchVoice}</if>
            <if test="slienceText != null  and slienceText != ''">and slienceText = #{slienceText}</if>
@@ -97,12 +101,12 @@
            <if test="submoduleVoice != null  and submoduleVoice != ''">and submoduleVoice = #{submoduleVoice}</if>
            <if test="noClearlyText != null  and noClearlyText != ''">and noClearlyText = #{noClearlyText}</if>
            <if test="noClearlyVoice != null  and noClearlyVoice != ''">and noClearlyVoice = #{noClearlyVoice}</if>
            <if test="nextQuestion != null  and nextQuestion != ''">and next_question = #{nextQuestion}</if>
            <if test="nextScriptno != null  and nextScriptno != ''">and next_scriptno = #{nextScriptno}</if>
            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
                '%')
            </if>
            <if test="questiontitle != null  and questiontitle != ''">and questiontitle like concat('%',
                #{questiontitle},
            <if test="scriptTopic != null  and scriptTopic != ''">and script_topic like concat('%',
                #{scriptTopic},
                '%')
            </if>
            <if test="playWavOnly != null ">and playWavOnly = #{playWavOnly}</if>
@@ -128,12 +132,12 @@
            keyProperty="ID">
        insert into ivr_liba_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="templateQuestionNum != null">templateQuestionNum,</if>
            <if test="scriptno != null">scriptno,</if>
            <if test="templateID != null">templateID,</if>
            <if test="scriptid != null">scriptID,</if>
            <if test="questionPoint != null and questionPoint != ''">questionPoint,</if>
            <if test="questionText != null">questionText,</if>
            <if test="questionVoice != null">questionVoice,</if>
            <if test=" scriptPoint != null and  scriptPoint != ''">script_point,</if>
            <if test="scriptContent != null">script_content,</if>
            <if test="scriptVoice != null">script_voice,</if>
            <if test="noMatchText != null">noMatchText,</if>
            <if test="noMatchVoice != null">noMatchVoice,</if>
            <if test="slienceText != null">slienceText,</if>
@@ -157,18 +161,19 @@
            <if test="guid != null">guid,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targetid != null">targetid,</if>
            <if test="questiontitle != null">questiontitle,</if>
            <if test="nextQuestion != null">next_question,</if>
            <if test="scriptTopic != null">script_topic,</if>
            <if test="nextScriptno != null">next_scriptno,</if>
            <if test="otherdata != null">otherdata,</if>
            <if test="isMust != null  and isMust != ''">is_must,</if>
            <if test="scriptDesc != null ">script_desc,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="templateQuestionNum != null">#{templateQuestionNum},</if>
            <if test="scriptno != null">#{scriptno},</if>
            <if test="templateID != null">#{templateID},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="questionPoint != null and questionPoint != ''">#{questionPoint},</if>
            <if test="questionText != null">#{questionText},</if>
            <if test="questionVoice != null">#{questionVoice},</if>
            <if test="scriptPoint != null and scriptPoint != ''">#{scriptPoint},</if>
            <if test="scriptContent != null">#{scriptContent},</if>
            <if test="scriptVoice != null">#{scriptVoice},</if>
            <if test="noMatchText != null">#{noMatchText},</if>
            <if test="noMatchVoice != null">#{noMatchVoice},</if>
            <if test="slienceText != null">#{slienceText},</if>
@@ -192,22 +197,23 @@
            <if test="guid != null">#{guid},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targetid != null">#{targetid},</if>
            <if test="questiontitle != null">#{questiontitle},</if>
            <if test="nextQuestion != null">#{nextQuestion},</if>
            <if test="scriptTopic != null">#{scriptTopic},</if>
            <if test="nextScriptno != null">#{nextScriptno},</if>
            <if test="otherdata != null">#{otherdata},</if>
            <if test="isMust != null  and isMust != ''">#{isMust},</if>
            <if test="scriptDesc != null ">#{scriptDesc},</if>
        </trim>
    </insert>
    <update id="updateIvrLibaTemplateScript" parameterType="com.smartor.domain.IvrLibaTemplateScript">
        update ivr_liba_template_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="templateQuestionNum != null">templateQuestionNum = #{templateQuestionNum},</if>
            <if test="scriptno != null">scriptno = #{scriptno},</if>
            <if test="templateID != null">templateID = #{templateID},</if>
            <if test="scriptid != null">scriptID = #{scriptid},</if>
            <if test="questionPoint != null and questionPoint != ''">questionPoint = #{questionPoint},</if>
            <if test="questionText != null">questionText = #{questionText},</if>
            <if test="questionVoice != null">questionVoice = #{questionVoice},</if>
            <if test="scriptPoint != null and scriptPoint != ''">script_point = #{scriptPoint},</if>
            <if test="scriptContent != null">script_content = #{scriptContent},</if>
            <if test="scriptVoice != null">script_voice = #{scriptVoice},</if>
            <if test="noMatchText != null">noMatchText = #{noMatchText},</if>
            <if test="noMatchVoice != null">noMatchVoice = #{noMatchVoice},</if>
            <if test="slienceText != null">slienceText = #{slienceText},</if>
@@ -230,10 +236,11 @@
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="questiontitle != null">questiontitle = #{questiontitle},</if>
            <if test="nextQuestion != null">next_question = #{nextQuestion},</if>
            <if test="scriptTopic != null">script_topic = #{scriptTopic},</if>
            <if test="nextScriptno != null">next_scriptno = #{nextScriptno},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="isMust != null  and isMust != ''">is_must = #{isMust}</if>
            <if test="scriptDesc != null ">script_desc = #{scriptDesc}</if>
        </trim>
        where ID = #{ID}
    </update>
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -10,7 +10,7 @@
        <result property="svyid" column="svyid"/>
        <result property="scripttype" column="script_type"/>
        <result property="scriptcode" column="script_code"/>
        <result property="script" column="script"/>
        <result property="scriptDesc" column="script_desc"/>
        <result property="scriptPicture" column="script_picture"/>
        <result property="sort" column="sort"/>
        <result property="ismandatory" column="ismandatory"/>
@@ -35,7 +35,7 @@
        <result property="scoretype" column="scoretype"/>
        <result property="score" column="score"/>
        <result property="icd10Name" column="icd10_name"/>
        <result property="topic" column="topic"/>
        <result property="scriptTopic" column="script_topic"/>
    </resultMap>
    <sql id="selectSvyLibScriptVo">
@@ -48,8 +48,8 @@
               svyid,
               script_type,
               script_code,
               script,
               topic,
               script_desc,
               script_topic,
               sort,
               ismandatory,
               ishide,
@@ -93,7 +93,7 @@
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="scoretype != null  and scoretype != ''">and scoretype = #{scoretype}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
            <if test="topic != null  and topic != ''">and topic = #{topic}</if>
            <if test="scriptTopic != null  and scriptTopic != ''">and script_topic = #{scriptTopic}</if>
        </where>
        order by id desc
    </select>
@@ -111,7 +111,7 @@
            <if test="svyid != null">svyid,</if>
            <if test="scripttype != null">script_type,</if>
            <if test="scriptcode != null">script_code,</if>
            <if test="script != null">script,</if>
            <if test="scriptDesc != null">script_desc,</if>
            <if test="sort != null">sort,</if>
            <if test="ismandatory != null">ismandatory,</if>
            <if test="ishide != null">ishide,</if>
@@ -136,14 +136,14 @@
            <if test="score != null and score!=''">score,</if>
            <if test="icd10Name != null and icd10Name!=''">icd10_name,</if>
            <if test="scriptPicture != null  and scriptPicture != ''">script_picture,</if>
            <if test="topic != null  and topic != ''">topic,</if>
            <if test="scriptTopic != null  and scriptTopic != ''">script_topic,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="oldid != null">#{oldid},</if>
            <if test="svyid != null">#{svyid},</if>
            <if test="scripttype != null">#{scripttype},</if>
            <if test="scriptcode != null">#{scriptcode},</if>
            <if test="script != null">#{script},</if>
            <if test="scriptDesc != null">#{scriptDesc},</if>
            <if test="sort != null">#{sort},</if>
            <if test="ismandatory != null">#{ismandatory},</if>
            <if test="ishide != null">#{ishide},</if>
@@ -168,7 +168,7 @@
            <if test="score != null and score!=''">#{score},</if>
            <if test="icd10Name != null and icd10Name!=''">#{icd10Name},</if>
            <if test="scriptPicture != null  and scriptPicture != ''">#{scriptPicture},</if>
            <if test="topic != null  and topic != ''">#{topic},</if>
            <if test="scriptTopic != null  and scriptTopic != ''">#{scriptTopic},</if>
        </trim>
    </insert>
@@ -179,7 +179,7 @@
            <if test="svyid != null">svyid = #{svyid},</if>
            <if test="scripttype != null">script_type = #{scripttype},</if>
            <if test="scriptcode != null">script_code = #{scriptcode},</if>
            <if test="script != null">script = #{script},</if>
            <if test="scriptDesc != null">script_desc = #{scriptDesc},</if>
            <if test="sort != null">sort = #{sort},</if>
            <if test="ismandatory != null">ismandatory = #{ismandatory},</if>
            <if test="ishide != null">ishide = #{ishide},</if>
@@ -204,7 +204,7 @@
            <if test="score != null and score!=''">score = #{score},</if>
            <if test="icd10Name != null and icd10Name!=''">icd10_name = #{icd10Name},</if>
            <if test="scriptPicture != null  and scriptPicture != ''">script_picture = #{scriptPicture},</if>
            <if test="topic != null  and topic != ''">topic = #{topic},</if>
            <if test="scriptTopic != null  and scriptTopic != ''">script_topic = #{scriptTopic},</if>
        </trim>
        where id = #{id}
    </update>
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -6,10 +6,9 @@
    <resultMap type="com.smartor.domain.SvyLibTemplateScript" id="SvyLibTemplateScriptResult">
        <result property="id" column="id"/>
        <result property="oldid" column="oldid"/>
        <result property="svyid" column="svyid"/>
        <result property="scriptType" column="script_type"/>
        <result property="seqno" column="seqno"/>
        <result property="nextScriptno" column="next_scriptno"/>
        <result property="scriptno" column="scriptno"/>
        <result property="scriptDesc" column="script_desc"/>
        <result property="tag" column="tag"/>
        <result property="sort" column="sort"/>
@@ -23,7 +22,7 @@
        <result property="updateTime" column="update_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="svyTopicid" column="svy_topicid"/>
        <result property="scriptid" column="scriptid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="categoryid" column="categoryid"/>
@@ -42,12 +41,13 @@
    <sql id="selectSvyLibTemplateScriptVo">
        select id,
               oldid,
               svyid,
               script_type,
               seqno,
               scriptid,
               scriptno,
               next_scriptno,
               script_desc,
               tag,
               next_scriptno,
               sort,
               ismandatory,
               ishide,
@@ -59,7 +59,6 @@
               update_time,
               isupload,
               upload_time,
               svy_topicid,
               pid,
               guid,
               categoryid,
@@ -76,10 +75,10 @@
        <include refid="selectSvyLibTemplateScriptVo"/>
        <where>
            del_flag=0
            <if test="oldid != null ">and oldid = #{oldid}</if>
            <if test="svyid != null ">and svyid = #{svyid}</if>
            <if test="nextScriptno != null ">and next_scriptno = #{nextScriptno}</if>
            <if test="scriptType != null  and scriptType != ''">and script_type = #{scriptType}</if>
            <if test="seqno != null  and seqno != ''">and seqno = #{seqno}</if>
            <if test="scriptno != null  and scriptno != ''">and scriptno = #{scriptno}</if>
            <if test="scriptid != null">and scriptid = #{scriptid}</if>
            <if test="scriptDesc != null  and scriptDesc != ''">and script_desc = #{scriptDesc}</if>
            <if test="tag != null  and tag != ''">and tag = #{tag}</if>
            <if test="sort != null ">and sort = #{sort}</if>
@@ -88,7 +87,6 @@
            <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="svyTopicid != null ">and svy_topicid = #{svyTopicid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="categoryid != null ">and categoryid = #{categoryid}</if>
@@ -114,10 +112,10 @@
            useGeneratedKeys="true" keyProperty="id">
        insert into svy_lib_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="oldid != null">oldid,</if>
            <if test="svyid != null">svyid,</if>
            <if test="nextScriptno != null">next_scriptno,</if>
            <if test="scriptid != null">scriptid,</if>
            <if test="scriptType != null">script_type,</if>
            <if test="seqno != null">seqno,</if>
            <if test="scriptno != null">scriptno,</if>
            <if test="scriptDesc != null">script_desc,</if>
            <if test="tag != null">tag,</if>
            <if test="sort != null">sort,</if>
@@ -131,7 +129,6 @@
            <if test="updateTime != null">update_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="svyTopicid != null">svy_topicid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="categoryid != null">categoryid,</if>
@@ -148,10 +145,10 @@
            <if test="scriptTopic != null">script_topic,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="oldid != null">#{oldid},</if>
            <if test="svyid != null">#{svyid},</if>
            <if test="nextScriptno != null">#{nextScriptno},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="scriptType != null">#{scriptType},</if>
            <if test="seqno != null">#{seqno},</if>
            <if test="scriptno != null">#{scriptno},</if>
            <if test="scriptDesc != null">#{scriptDesc},</if>
            <if test="tag != null">#{tag},</if>
            <if test="sort != null">#{sort},</if>
@@ -165,7 +162,6 @@
            <if test="updateTime != null">#{updateTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="svyTopicid != null">#{svyTopicid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="categoryid != null">#{categoryid},</if>
@@ -186,10 +182,10 @@
    <update id="updateSvyLibTemplateScript" parameterType="com.smartor.domain.SvyLibTemplateScript">
        update svy_lib_template_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="oldid != null">oldid = #{oldid},</if>
            <if test="svyid != null">svyid = #{svyid},</if>
            <if test="nextScriptno != null">next_scriptno = #{nextScriptno},</if>
            <if test="scriptid != null">scriptid = #{scriptid},</if>
            <if test="scriptType != null">script_type = #{scriptType},</if>
            <if test="seqno != null">seqno = #{seqno},</if>
            <if test="scriptno != null">scriptno = #{scriptno},</if>
            <if test="scriptDesc != null">script_desc = #{scriptDesc},</if>
            <if test="tag != null">tag = #{tag},</if>
            <if test="sort != null">sort = #{sort},</if>
@@ -203,7 +199,6 @@
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="svyTopicid != null">svy_topicid = #{svyTopicid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="categoryid != null">categoryid = #{categoryid},</if>
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -7,15 +7,15 @@
    <resultMap type="com.smartor.domain.SvyTaskTemplateScript" id="SvyTaskTemplateScriptResult">
        <result property="ID"    column="ID"    />
        <result property="taskid"    column="taskid"    />
        <result property="templateQuestionNum"    column="templateQuestionNum"    />
        <result property="scriptno"    column="scriptno"    />
        <result property="templateID"    column="templateID"    />
        <result property="scriptID"    column="scriptID"    />
        <result property="questiontitle"    column="questiontitle"    />
        <result property="scriptid"    column="scriptid"    />
        <result property="scriptDesc"    column="script_desc"    />
        <result property="language"    column="language"    />
        <result property="categoryName"    column="categoryName"    />
        <result property="questionPoint"    column="questionPoint"    />
        <result property="questionText"    column="questionText"    />
        <result property="questionVoice"    column="questionVoice"    />
        <result property="scriptPoint"    column="script_point"    />
        <result property="scriptContent"    column="script_content"    />
        <result property="scriptVoice"    column="script_voice"    />
        <result property="noMatchText"    column="noMatchText"    />
        <result property="noMatchVoice"    column="noMatchVoice"    />
        <result property="slienceText"    column="slienceText"    />
@@ -41,31 +41,31 @@
        <result property="targettype"    column="targettype"    />
        <result property="targetid"    column="targetid"    />
        <result property="targetvalue"    column="targetvalue"    />
        <result property="nextQuestion"    column="next_question"    />
        <result property="questionResult"    column="question_result"    />
        <result property="nextScriptno"    column="next_scriptno"    />
        <result property="scriptResult"    column="script_result"    />
        <result property="otherdata"    column="otherdata"    />
        <result property="picturePath"    column="picture_path"    />
        <result property="sort"    column="sort"    />
        <result property="topic"    column="topic"    />
        <result property="scriptTopic"    column="script_topic"    />
    </resultMap>
    <sql id="selectSvyTaskTemplateScriptVo">
        select ID,sort,topic, taskid, templateQuestionNum, templateID, scriptID, questiontitle, language, categoryName, questionPoint, questionText, questionVoice, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, is_must, playWavOnly, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetOptions, targettype, targetid, targetvalue, next_question, question_result, otherdata, picture_path from svy_task_template_script
        select ID,sort,script_desc, taskid, scriptno, templateID, scriptid, script_topic, language, categoryName, script_point, script_content, script_voice, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, is_must, playWavOnly, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetOptions, targettype, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path from svy_task_template_script
    </sql>
    <select id="selectSvyTaskTemplateScriptList" parameterType="com.smartor.domain.SvyTaskTemplateScript" resultMap="SvyTaskTemplateScriptResult">
        <include refid="selectSvyTaskTemplateScriptVo"/>
        <where>
            <if test="taskid != null "> and taskid = #{taskid}</if>
            <if test="templateQuestionNum != null "> and templateQuestionNum = #{templateQuestionNum}</if>
            <if test="scriptno != null "> and scriptno = #{scriptno}</if>
            <if test="templateID != null "> and templateID = #{templateID}</if>
            <if test="scriptID != null "> and scriptID = #{scriptID}</if>
            <if test="questiontitle != null  and questiontitle != ''"> and questiontitle = #{questiontitle}</if>
            <if test="scriptid != null "> and scriptid = #{scriptid}</if>
            <if test="scriptDesc != null  and scriptDesc != ''"> and script_desc = #{scriptDesc}</if>
            <if test="language != null  and language != ''"> and language = #{language}</if>
            <if test="categoryName != null  and categoryName != ''"> and categoryName like concat('%', #{categoryName}, '%')</if>
            <if test="questionPoint != null  and questionPoint != ''"> and questionPoint = #{questionPoint}</if>
            <if test="questionText != null  and questionText != ''"> and questionText = #{questionText}</if>
            <if test="questionVoice != null  and questionVoice != ''"> and questionVoice = #{questionVoice}</if>
            <if test="scriptPoint != null  and scriptPoint != ''"> and script_point = #{scriptPoint}</if>
            <if test="scriptContent != null  and scriptContent != ''"> and script_content = #{scriptContent}</if>
            <if test="scriptVoice != null  and scriptVoice != ''"> and script_voice = #{scriptVoice}</if>
            <if test="noMatchText != null  and noMatchText != ''"> and noMatchText = #{noMatchText}</if>
            <if test="noMatchVoice != null  and noMatchVoice != ''"> and noMatchVoice = #{noMatchVoice}</if>
            <if test="slienceText != null  and slienceText != ''"> and slienceText = #{slienceText}</if>
@@ -86,11 +86,11 @@
            <if test="targettype != null  and targettype != ''"> and targettype = #{targettype}</if>
            <if test="targetid != null "> and targetid = #{targetid}</if>
            <if test="targetvalue != null  and targetvalue != ''"> and targetvalue = #{targetvalue}</if>
            <if test="nextQuestion != null "> and next_question = #{nextQuestion}</if>
            <if test="questionResult != null  and questionResult != ''"> and question_result = #{questionResult}</if>
            <if test="nextScriptno != null "> and next_scriptno = #{nextScriptno}</if>
            <if test="scriptResult != null  and scriptResult != ''"> and script_result = #{scriptResult}</if>
            <if test="otherdata != null  and otherdata != ''"> and otherdata = #{otherdata}</if>
            <if test="picturePath != null  and picturePath != ''"> and picture_path = #{picturePath}</if>
            <if test="topic != null  and topic != ''"> and topic = #{topic}</if>
            <if test="scriptTopic != null  and scriptTopic != ''"> and script_topic = #{scriptTopic}</if>
        </where>
    </select>
@@ -103,15 +103,15 @@
        insert into svy_task_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="taskid != null">taskid,</if>
            <if test="templateQuestionNum != null">templateQuestionNum,</if>
            <if test="scriptno != null">scriptno,</if>
            <if test="templateID != null">templateID,</if>
            <if test="scriptID != null">scriptID,</if>
            <if test="questiontitle != null">questiontitle,</if>
            <if test="scriptid != null">scriptid,</if>
            <if test="scriptDesc != null">script_desc,</if>
            <if test="language != null">language,</if>
            <if test="categoryName != null">categoryName,</if>
            <if test="questionPoint != null">questionPoint,</if>
            <if test="questionText != null">questionText,</if>
            <if test="questionVoice != null">questionVoice,</if>
            <if test="scriptPoint != null">script_point,</if>
            <if test="scriptContent != null">script_content,</if>
            <if test="scriptVoice != null">script_voice,</if>
            <if test="noMatchText != null">noMatchText,</if>
            <if test="noMatchVoice != null">noMatchVoice,</if>
            <if test="slienceText != null">slienceText,</if>
@@ -137,24 +137,24 @@
            <if test="targettype != null">targettype,</if>
            <if test="targetid != null">targetid,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="nextQuestion != null">next_question,</if>
            <if test="questionResult != null">question_result,</if>
            <if test="nextScriptno != null">next_scriptno,</if>
            <if test="scriptResult != null">script_result,</if>
            <if test="otherdata != null">otherdata,</if>
            <if test="picturePath != null">picture_path,</if>
            <if test="sort != null">sort,</if>
            <if test="topic != null">topic,</if>
            <if test="scriptTopic != null">script_topic,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskid != null">#{taskid},</if>
            <if test="templateQuestionNum != null">#{templateQuestionNum},</if>
            <if test="scriptno != null">#{scriptno},</if>
            <if test="templateID != null">#{templateID},</if>
            <if test="scriptID != null">#{scriptID},</if>
            <if test="questiontitle != null">#{questiontitle},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="scriptDesc != null">#{scriptDesc},</if>
            <if test="language != null">#{language},</if>
            <if test="categoryName != null">#{categoryName},</if>
            <if test="questionPoint != null">#{questionPoint},</if>
            <if test="questionText != null">#{questionText},</if>
            <if test="questionVoice != null">#{questionVoice},</if>
            <if test="scriptPoint != null">#{scriptPoint},</if>
            <if test="scriptContent != null">#{scriptContent},</if>
            <if test="scriptVoice != null">#{scriptVoice},</if>
            <if test="noMatchText != null">#{noMatchText},</if>
            <if test="noMatchVoice != null">#{noMatchVoice},</if>
            <if test="slienceText != null">#{slienceText},</if>
@@ -180,12 +180,12 @@
            <if test="targettype != null">#{targettype},</if>
            <if test="targetid != null">#{targetid},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="nextQuestion != null">#{nextQuestion},</if>
            <if test="questionResult != null">#{questionResult},</if>
            <if test="nextScriptno != null">#{nextScriptno},</if>
            <if test="scriptResult != null">#{scriptResult},</if>
            <if test="otherdata != null">#{otherdata},</if>
            <if test="picturePath != null">#{picturePath},</if>
            <if test="sort != null">#{sort},</if>
            <if test="topic != null">#{topic},</if>
            <if test="scriptTopic != null">#{scriptTopic},</if>
         </trim>
    </insert>
@@ -193,15 +193,15 @@
        update svy_task_template_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="taskid != null">taskid = #{taskid},</if>
            <if test="templateQuestionNum != null">templateQuestionNum = #{templateQuestionNum},</if>
            <if test="scriptno != null">scriptno = #{scriptno},</if>
            <if test="templateID != null">templateID = #{templateID},</if>
            <if test="scriptID != null">scriptID = #{scriptID},</if>
            <if test="questiontitle != null">questiontitle = #{questiontitle},</if>
            <if test="scriptid != null">scriptid = #{scriptid},</if>
            <if test="scriptDesc != null">script_desc = #{scriptDesc},</if>
            <if test="language != null">language = #{language},</if>
            <if test="categoryName != null">categoryName = #{categoryName},</if>
            <if test="questionPoint != null">questionPoint = #{questionPoint},</if>
            <if test="questionText != null">questionText = #{questionText},</if>
            <if test="questionVoice != null">questionVoice = #{questionVoice},</if>
            <if test="scriptPoint != null">script_point = #{scriptPoint},</if>
            <if test="scriptContent != null">script_content = #{scriptContent},</if>
            <if test="scriptVoice != null">script_voice = #{scriptVoice},</if>
            <if test="noMatchText != null">noMatchText = #{noMatchText},</if>
            <if test="noMatchVoice != null">noMatchVoice = #{noMatchVoice},</if>
            <if test="slienceText != null">slienceText = #{slienceText},</if>
@@ -227,12 +227,12 @@
            <if test="targettype != null">targettype = #{targettype},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="nextQuestion != null">next_question = #{nextQuestion},</if>
            <if test="questionResult != null">question_result = #{questionResult},</if>
            <if test="nextScriptno != null">next_scriptno = #{nextScriptno},</if>
            <if test="scriptResult != null">script_result = #{scriptResult},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
            <if test="sort != null">sort = #{sort},</if>
            <if test="topic != null">topic = #{topic},</if>
            <if test="scriptTopic != null">script_topic = #{scriptTopic},</if>
        </trim>
        where ID = #{ID}
    </update>