smartor.git - Gitblit

			@@ -92,6 +92,7 @@
			<result property="continueContent" column="continue_content"/>
			<result property="continueCount" column="continue_count"/>
			<result property="continueTimeNext" column="continue_time_next"/>
			<result property="operationItemId" column="operation_item_id"/>
			</resultMap>

			<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
			@@ -212,6 +213,7 @@
			continue_content,
			continue_count,
			continue_time_next,
			operation_item_id,
			task_situation
			from service_subtask
			</sql>
			@@ -264,6 +266,7 @@
			resultMap="ServiceSubtaskResult">
			<include refid="selectServiceSubtaskVo"/>
			where del_flag = 0
			<if test="subId != null ">and id = #{subId}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
			<if test="continueCount != null ">and continue_count = #{continueCount}</if>
			@@ -298,6 +301,12 @@
			<if test="senderdetail != null and senderdetail != ''">and senderdetail = #{senderdetail}</if>
			<if test="type != null and type != ''">and type = #{type}</if>
			<if test="taskid != null ">and taskid = #{taskid}</if>
			<if test="sendstates != null and sendstates.size() > 0">
			AND sendstate IN
			<foreach collection="sendstates" item="state" open="(" separator="," close=")">
			#{state}
			</foreach>
			</if>
			<!-- taskIds筛选 -->
			<if test="taskIds != null and taskIds.size() > 0">
			AND taskid IN
			@@ -871,6 +880,7 @@
			<if test="continueCount != null ">continue_count,</if>
			<if test="continueTimeNext != null ">continue_time_next,</if>
			<if test="continueContent != null ">continue_content,</if>
			<if test="operationItemId != null ">operation_item_id,</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="sendname != null">#{sendname},</if>
			@@ -962,6 +972,7 @@
			<if test="continueCount != null ">#{continueCount},</if>
			<if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
			<if test="continueContent != null ">#{continueContent},</if>
			<if test="operationItemId != null ">#{operationItemId},</if>
			</trim>
			</insert>

			@@ -1058,6 +1069,7 @@
			<if test="continueCount != null ">continue_count = #{continueCount},</if>
			<if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
			<if test="continueContent != null ">continue_content = #{continueContent},</if>
			<if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
			</trim>
			where id = #{id}
			</update>
			@@ -1391,6 +1403,7 @@
			deptname,
			sendstate,
			preachform,
			current_preachform,
			excep,
			nurse_id,
			nurse_name,
			@@ -2542,3 +2555,4 @@
			</select>

			</mapper>