From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 22 七月 2024 18:06:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index 478d8ff..a9387f9 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -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> -- Gitblit v1.8.0