Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml

@@ -39,11 +39,15 @@
        <result property="score" column="score"/>
        <result property="prompt" column="prompt"/>
        <result property="isEnd" column="is_end"/>
        <result property="sendTaskid" column="send_taskid"/>
        <result property="sendTaskname" column="send_taskname"/>
    </resultMap>

    <sql id="selectIvrLibaTemplateTargetoptionVo">
        select id,
               targetid,
               send_taskid,
               send_taskname,
               is_end,
               score,
               appendflag,
@@ -68,8 +72,8 @@
    <select id="selectIvrLibaTemplateTargetoptionList" parameterType="com.smartor.domain.IvrLibaTemplateTargetoption"
            resultMap="IvrLibaTemplateTargetoptionResult">
        <include refid="selectIvrLibaTemplateTargetoptionVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="isEnd != null ">and is_end = #{isEnd}</if>
            <if test="score != null ">and score = #{score}</if>
@@ -98,7 +102,8 @@
            <if test="appendflag != null">and appendflag = #{appendflag}</if>
            <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
            <if test="optionNo != null">and option_no = #{optionNo}</if>
        </where>
            <if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
            <if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
    </select>

    <select id="selectIvrLibaTemplateTargetoptionById" parameterType="Long"
@@ -143,6 +148,8 @@
            <if test="optionNo != null">option_no,</if>
            <if test="score != null">score,</if>
            <if test="isEnd != null ">is_end,</if>
            <if test="sendTaskid != null">send_taskid,</if>
            <if test="sendTaskname != null">send_taskname,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="targetid != null">#{targetid},</if>
@@ -177,6 +184,8 @@
            <if test="optionNo != null">#{optionNo},</if>
            <if test="score != null">#{score},</if>
            <if test="isEnd != null ">#{isEnd},</if>
            <if test="sendTaskid != null">#{sendTaskid},</if>
            <if test="sendTaskname != null">#{sendTaskname},</if>
        </trim>
    </insert>

@@ -215,6 +224,8 @@
            <if test="optionNo != null">option_no = #{optionNo},</if>
            <if test="score != null">score = #{score},</if>
            <if test="isEnd != null ">is_end = #{isEnd},</if>
            <if test="sendTaskid != null">send_taskid= #{sendTaskid},</if>
            <if test="sendTaskname != null">send_taskname = #{sendTaskname},</if>
        </trim>
        where id = #{id}
    </update>