pipIrr-SV.git - Gitblit

			@@ -224,14 +224,17 @@
			ord.complete_time AS completeTime,
			ord.dispatch_time AS dispatchTime,
			ord.reject_times AS rejectTimes,
			res.id AS proResultId,
			res.state AS proResultStateId,
			CASE
			WHEN ord.state = 1 THEN '未完成'
			WHEN ord.state = 2 THEN '已完成'
			END AS state,
			CASE
			WHEN res.state = 1 THEN '已上报'
			WHEN res.state = 0 THEN '未上报'
			WHEN res.state = 1 THEN '待审核'
			WHEN res.state = 2 THEN '已通过'
			WHEN res.state = 3 THEN '已驳回'
			WHEN res.state = 3 THEN '被驳回'
			ELSE '未上报'
			END AS processingState
			FROM ope_work_order ord
			@@ -269,12 +272,24 @@
			<where>
			AND ord.deleted = 0

			<if test = "dispatcherId != null">
			AND ord.dispatcher_id = #{dispatcherId}
			</if>

			<if test = "inspectorId != null">
			AND ord.inspector_id = #{inspectorId}
			</if>

			<if test = "dispatcher != null and dispatcher !=''">
			AND us1.name like CONCAT('%',#{dispatcher},'%')
			</if>

			<if test = "inspector != null and inspector !=''">
			AND us2.name like CONCAT('%',#{inspector},'%')
			</if>

			<if test = "state != null">
			AND ord.state = #{state}
			</if>

			<if test = "timeStart != null and timeStop != null">
			@@ -299,16 +314,19 @@
			ord.complete_time AS completeTime,
			ord.dispatch_time AS dispatchTime,
			ord.reject_times AS rejectTimes,
			res.state AS proResultStateId,
			CASE
			WHEN ord.state = 1 THEN '未完成'
			WHEN ord.state = 2 THEN '已完成'
			END AS state,
			CASE
			WHEN res.state = 1 THEN '已上报'
			WHEN res.state = 0 THEN '未上报'
			WHEN res.state = 1 THEN '待审核'
			WHEN res.state = 2 THEN '已通过'
			WHEN res.state = 3 THEN '已驳回'
			WHEN res.state = 3 THEN '被驳回'
			ELSE '未上报'
			END AS processingState
			END AS processingState,
			res.id AS proResultId
			FROM ope_work_order ord
			INNER JOIN ba_user us1 ON us1.id = ord.dispatcher_id
			INNER JOIN ba_user us2 ON us2.id = ord.inspector_id
			@@ -317,6 +335,14 @@
			<where>
			AND ord.deleted = 0

			<if test = "dispatcherId != null">
			AND ord.dispatcher_id = #{dispatcherId}
			</if>

			<if test = "inspectorId != null">
			AND ord.inspector_id = #{inspectorId}
			</if>

			<if test = "dispatcher != null and dispatcher !=''">
			AND us1.name like CONCAT('%',#{dispatcher},'%')
			</if>
			@@ -325,6 +351,10 @@
			AND us2.name like CONCAT('%',#{inspector},'%')
			</if>

			<if test = "state != null">
			AND ord.state = #{state}
			</if>

			<if test = "timeStart != null and timeStop != null">
			AND ord.dispatch_time BETWEEN #{timeStart} AND #{timeStop}
			</if>