From 6d64745bca5a75f31228fcd93b60677870ce2fa0 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 27 十一月 2024 15:34:02 +0800 Subject: [PATCH] 重构获取工单列表接口,查询条件中完成状态 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml index 2cdd204..6601a2a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml @@ -269,12 +269,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"> @@ -317,6 +329,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 +345,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> -- Gitblit v1.8.0