zgyw.git - Gitblit

			@@ -13,6 +13,7 @@
			<result column="yw_result" property="ywResult"/>
			<result column="yw_condition" property="ywCondition"/>
			<result column="yw_check_result" property="ywCheckResult"/>
			<result column="overtime" property="overtime"/>
			</resultMap>

			<select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
			@@ -22,10 +23,10 @@
			p.yw_person_name
			FROM
			t_work_order wo
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
			where
			wo.deleted = '0'
			wo.deleted = 0
			<if test="query.workOrderNo != null and query.workOrderNo != ''">
			AND wo.work_order_no = #{query.workOrderNo}
			</if>
			@@ -48,10 +49,10 @@
			p.yw_person_name
			FROM
			t_work_order wo
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
			where
			wo.deleted = '0'
			wo.deleted = 0
			<if test="query.unitId != null">
			AND wo.unit_id = #{query.unitId}
			</if>