~liusheng/smartor.git

			@@ -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,12 @@
			<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"/>
			</resultMap>

			<sql id="selectIvrTaskVo">
			@@ -48,8 +52,6 @@
			executed,
			unexecuted,
			fail,
			userid,
			username,
			addtime,
			checkuserid,
			checkusername,
			@@ -67,6 +69,12 @@
			create_time,
			isupload,
			upload_time,
			pid,
			guid,
			preachform,
			is_send,
			send_state,
			param,
			orgid
			from ivr_task
			</sql>
			@@ -85,8 +93,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('%',
			@@ -103,7 +109,7 @@
			<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</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,7 +121,6 @@
			keyProperty="taskid">
			insert into ivr_task
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="taskid != null">taskid,</if>
			<if test="taskname != null">taskname,</if>
			<if test="templateid != null">templateid,</if>
			<if test="templatename != null">templatename,</if>
			@@ -125,8 +130,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,9 +148,14 @@
			<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>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="taskid != null">#{taskid},</if>
			<if test="taskname != null">#{taskname},</if>
			<if test="templateid != null">#{templateid},</if>
			<if test="templatename != null">#{templatename},</if>
			@@ -157,8 +165,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,6 +183,12 @@
			<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>
			</trim>
			</insert>

			@@ -192,8 +204,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 +222,12 @@
			<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>
			</trim>
			where taskid = #{taskid}
			</update>