Merge branch 'master-where标签替换'

陈昶聿

3 天以前 d2d33d9e10b6a68b84a43a1b970a94246ffdf801

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

@@ -42,11 +42,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="selectIvrTaskTemplateTargetoptionVo">
        select id,
               taskid,
               send_taskid,
               send_taskname,
               is_end,
               templateID,
               score,
@@ -67,7 +71,7 @@
    <select id="selectIvrTaskTemplateTargetoptionList" parameterType="com.smartor.domain.IvrTaskTemplateTargetoption"
            resultMap="IvrTaskTemplateTargetoptionResult">
        <include refid="selectIvrTaskTemplateTargetoptionVo"/>
        <where>
        where 1=1
            <if test="taskid != null ">and taskid = #{taskid}</if>
            <if test="isEnd != null ">and is_end = #{isEnd}</if>
            <if test="templateID != null ">and templateID = #{templateID}</if>
@@ -102,7 +106,8 @@
            <if test="optionCode != null ">and option_code = #{optionCode}</if>
            <if test="isUserOperation != null ">and is_user_operation = #{isUserOperation}</if>
            <if test="score != null ">and score = #{score}</if>
        </where>
            <if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
            <if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
    </select>

    <select id="selectIvrTaskTemplateTargetoptionById" parameterType="Long"
@@ -150,6 +155,8 @@
            <if test="isUserOperation != null ">is_user_operation,</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="taskid != null">#{taskid},</if>
@@ -187,6 +194,8 @@
            <if test="isUserOperation != null ">#{isUserOperation},</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>

@@ -228,6 +237,8 @@
            <if test="isUserOperation != null ">is_user_operation = #{isUserOperation},</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>