Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -35,6 +35,7 @@
        <result property="questiontext" column="questiontext"/>
        <result property="questionvoice" column="questionvoice"/>
        <result property="categoryname" column="categoryname"/>
        <result property="categoryid" column="categoryid"/>
        <result property="targetoptions" column="targetoptions"/>
        <result property="targetvalue" column="targetvalue"/>
        <result property="matchedtext" column="matchedtext"/>
@@ -54,7 +55,6 @@
        <result property="patid" column="patid"/>
        <result property="guid" column="guid"/>
        <result property="extemplateText" column="extemplate_text"/>
        <result property="answerps" column="answerps"/>
    </resultMap>
    <resultMap type="com.smartor.domain.ServiceSubtaskDetailTarget" id="ServiceSubtaskDetailTargetResult">
        <result property="targetid" column="targetid"/>
@@ -100,6 +100,7 @@
               questiontext,
               questionvoice,
               categoryname,
               categoryid,
               targetoptions,
               targetvalue,
               matchedtext,
@@ -112,15 +113,14 @@
               update_by,
               update_time,
               value_type,
               create_by,
               answerps
               create_by
        from service_subtask_detail
    </sql>

    <select id="selectServiceSubtaskDetailList" parameterType="com.smartor.domain.ServiceSubtaskDetail"
            resultMap="ServiceSubtaskDetailResult">
        <include refid="selectServiceSubtaskDetailVo"/>
        <where>
        where 1=1
            <if test="subId != null">and sub_id = #{subId}</if>
            <if test="targetid != null">and targetid = #{targetid}</if>
            <if test="extemplateText != null">and extemplate_text = #{extemplateText}</if>
@@ -148,6 +148,7 @@
            <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
            <if test="templatequestionnum != null ">and templatequestionnum = #{templatequestionnum}</if>
            <if test="switchid != null ">and switchid = #{switchid}</if>
            <if test="categoryid != null ">and categoryid = #{categoryid}</if>
            <if test="questiontext != null  and questiontext != ''">and questiontext = #{questiontext}</if>
            <if test="questionvoice != null  and questionvoice != ''">and questionvoice = #{questionvoice}</if>
            <if test="categoryname != null  and categoryname != ''">and categoryname like concat('%', #{categoryname},
@@ -165,7 +166,6 @@
            <if test="comment != null  and comment != ''">and comment = #{comment}</if>
            <if test="scriptid != null ">and scriptid = #{scriptid}</if>
            <if test=" patid != null">and patid = #{patid}</if>
        </where>
    </select>

    <select id="selectServiceSubtaskDetailByCalldetailid" parameterType="String" resultMap="ServiceSubtaskDetailResult">
@@ -173,7 +173,9 @@
        where id = #{id}
    </select>

    <insert id="insertServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail">
    <insert id="insertServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail"
            useGeneratedKeys="true"
            keyProperty="id">
        insert into service_subtask_detail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -225,6 +227,7 @@
            <if test=" patid != null">patid,</if>
            <if test=" extemplateText != null">extemplate_text,</if>
            <if test=" guid != null">guid,</if>
            <if test=" categoryid != null">categoryid,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -276,6 +279,7 @@
            <if test="patid != null">#{patid},</if>
            <if test="extemplateText != null">#{extemplateText},</if>
            <if test="guid != null">#{guid},</if>
            <if test="categoryid != null">#{categoryid},</if>
        </trim>
    </insert>

@@ -330,6 +334,7 @@
            <if test=" patid != null">patid = #{patid},</if>
            <if test=" extemplateText != null">extemplate_text = #{extemplateText},</if>
            <if test=" guid != null">guid = #{guid},</if>
            <if test=" categoryid != null">categoryid = #{categoryid},</if>
        </trim>
        where id = #{id}
    </update>
@@ -386,6 +391,7 @@
            <if test=" patid != null">patid = #{patid},</if>
            <if test=" extemplateText != null">extemplate_text = #{extemplateText},</if>
            <if test=" guid != null">guid = #{guid},</if>
            <if test=" categoryid != null">categoryid = #{categoryid},</if>
        </trim>
        where patid = #{patid} and scriptid = #{scriptid} and sub_id = #{subId}
    </update>