From 34ffbeeebdd7fc7ee2db39a6e9940390d7272370 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 28 十一月 2024 09:04:54 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 8 ++++++++ 1 files changed, 8 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 bb25f7a..6601a2a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml @@ -285,6 +285,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> @@ -341,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