From 29d027349c605bda0b7944301cd82a25ec9c1d7a Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 07 五月 2024 16:42:03 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml | 68 ++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml index aac85aa..a2729d0 100644 --- a/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml +++ b/smartor/src/main/resources/mapper/smartor/IvrTaskMapper.xml @@ -6,7 +6,7 @@ <resultMap type="com.smartor.domain.IvrTask" id="IvrTaskResult"> <result property="taskid" column="taskid"/> - <result property="taskname" column="taskname"/> + <result property="taskName" column="taskname"/> <result property="templateid" column="templateid"/> <result property="templatename" column="templatename"/> <result property="labelinfo" column="labelinfo"/> @@ -15,8 +15,6 @@ <result property="executed" column="executed"/> <result property="unexecuted" column="unexecuted"/> <result property="fail" column="fail"/> - <result property="userid" column="userid"/> - <result property="username" column="username"/> <result property="addtime" column="addtime"/> <result property="checkuserid" column="checkuserid"/> <result property="checkusername" column="checkusername"/> @@ -35,6 +33,14 @@ <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="orgid" column="orgid"/> + <result property="pid" column="pid"/> + <result property="guid" column="guid"/> + <result property="preachform" column="preachform"/> + <result property="isSend" column="is_send"/> + <result property="sendState" column="send_state"/> + <result property="param" column="param"/> + <result property="hospType" column="hosp_type"/> + <result property="hospno" column="hospno"/> </resultMap> <sql id="selectIvrTaskVo"> @@ -48,13 +54,13 @@ executed, unexecuted, fail, - userid, - username, addtime, checkuserid, checkusername, checktime, type, + hosp_type, + hospno, typename, usebqsms, usebhsms, @@ -67,6 +73,12 @@ create_time, isupload, upload_time, + pid, + guid, + preachform, + is_send, + send_state, + param, orgid from ivr_task </sql> @@ -74,7 +86,7 @@ <select id="selectIvrTaskList" parameterType="com.smartor.domain.IvrTask" resultMap="IvrTaskResult"> <include refid="selectIvrTaskVo"/> <where> - <if test="taskname != null and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if> + <if test="taskName != null and taskName != ''">and taskname like concat('%', #{taskName}, '%')</if> <if test="templateid != null and templateid != ''">and templateid = #{templateid}</if> <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename}, '%') @@ -85,8 +97,6 @@ <if test="executed != null ">and executed = #{executed}</if> <if test="unexecuted != null ">and unexecuted = #{unexecuted}</if> <if test="fail != null ">and fail = #{fail}</if> - <if test="userid != null and userid != ''">and userid = #{userid}</if> - <if test="username != null and username != ''">and username like concat('%', #{username}, '%')</if> <if test="addtime != null ">and addtime = #{addtime}</if> <if test="checkuserid != null and checkuserid != ''">and checkuserid = #{checkuserid}</if> <if test="checkusername != null and checkusername != ''">and checkusername like concat('%', @@ -102,8 +112,10 @@ <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> + <if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if> + <if test="hospno != null and hospno != ''">and orgid = #{hospno}</if> </where> - order by upeate_time desc,taskid desc + order by update_time desc,taskid desc </select> <select id="selectIvrTaskByTaskid" parameterType="Long" resultMap="IvrTaskResult"> @@ -115,8 +127,7 @@ keyProperty="taskid"> insert into ivr_task <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="taskid != null">taskid,</if> - <if test="taskname != null">taskname,</if> + <if test="taskName != null">taskname,</if> <if test="templateid != null">templateid,</if> <if test="templatename != null">templatename,</if> <if test="labelinfo != null">labelinfo,</if> @@ -125,8 +136,6 @@ <if test="executed != null">executed,</if> <if test="unexecuted != null">unexecuted,</if> <if test="fail != null">fail,</if> - <if test="userid != null">userid,</if> - <if test="username != null">username,</if> <if test="addtime != null">addtime,</if> <if test="checkuserid != null">checkuserid,</if> <if test="checkusername != null">checkusername,</if> @@ -145,10 +154,17 @@ <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="orgid != null">orgid,</if> + <if test="pid != null">pid,</if> + <if test="guid != null">guid,</if> + <if test="preachform != null">preachform,</if> + <if test="isSend != null">is_send,</if> + <if test="sendState != null">send_state,</if> + <if test="param != null">param,</if> + <if test="hospType != null and hospType != ''">hosp_type,</if> + <if test="hospno != null and hospno != ''">hospno,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="taskid != null">#{taskid},</if> - <if test="taskname != null">#{taskname},</if> + <if test="taskName != null">#{taskName},</if> <if test="templateid != null">#{templateid},</if> <if test="templatename != null">#{templatename},</if> <if test="labelinfo != null">#{labelinfo},</if> @@ -157,8 +173,6 @@ <if test="executed != null">#{executed},</if> <if test="unexecuted != null">#{unexecuted},</if> <if test="fail != null">#{fail},</if> - <if test="userid != null">#{userid},</if> - <if test="username != null">#{username},</if> <if test="addtime != null">#{addtime},</if> <if test="checkuserid != null">#{checkuserid},</if> <if test="checkusername != null">#{checkusername},</if> @@ -177,13 +191,21 @@ <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> + <if test="pid != null">#{pid},</if> + <if test="guid != null">#{guid},</if> + <if test="preachform != null">#{preachform},</if> + <if test="isSend != null">#{isSend},</if> + <if test="sendState != null">#{sendState},</if> + <if test="param != null">#{param},</if> + <if test="hospType != null and hospType != ''">#{hospType},</if> + <if test="hospno != null and hospno != ''">#{hospno},</if> </trim> </insert> <update id="updateIvrTask" parameterType="com.smartor.domain.IvrTask"> update ivr_task <trim prefix="SET" suffixOverrides=","> - <if test="taskname != null">taskname = #{taskname},</if> + <if test="taskName != null">taskname = #{taskName},</if> <if test="templateid != null">templateid = #{templateid},</if> <if test="templatename != null">templatename = #{templatename},</if> <if test="labelinfo != null">labelinfo = #{labelinfo},</if> @@ -192,8 +214,6 @@ <if test="executed != null">executed = #{executed},</if> <if test="unexecuted != null">unexecuted = #{unexecuted},</if> <if test="fail != null">fail = #{fail},</if> - <if test="userid != null">userid = #{userid},</if> - <if test="username != null">username = #{username},</if> <if test="addtime != null">addtime = #{addtime},</if> <if test="checkuserid != null">checkuserid = #{checkuserid},</if> <if test="checkusername != null">checkusername = #{checkusername},</if> @@ -212,6 +232,14 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> + <if test="pid != null">pid = #{pid},</if> + <if test="guid != null">guid = #{guid},</if> + <if test="preachform != null">preachform = #{preachform},</if> + <if test="isSend != null">is_send = #{isSend},</if> + <if test="sendState != null">send_state = #{sendState},</if> + <if test="param != null">param = #{param},</if> + <if test="hospType != null and hospType != ''">hosp_type = #{hospType},</if> + <if test="hospno != null and hospno != ''">hospno = #{hospno},</if> </trim> where taskid = #{taskid} </update> -- Gitblit v1.9.3