From 6d64745bca5a75f31228fcd93b60677870ce2fa0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 27 十一月 2024 15:34:02 +0800
Subject: [PATCH] 重构获取工单列表接口，查询条件中完成状态
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java | 5 +++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 8 ++++++++
2 files changed, 13 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>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
index 138e9f5..592eed1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
@@ -35,6 +35,11 @@
private Long inspectorId;
/**
+ * 鐘舵�侊細1-鏈畬鎴愶紝2-宸插畬鎴�
+ */
+ private Integer state;
+
+ /**
* 鏌ヨ寮�濮嬫椂闂�
*/
private String timeStart;
--
Gitblit v1.8.0