From c0416f1a5154926e74e472aad2dc027eca5f94cb Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 26 十一月 2024 17:04:40 +0800
Subject: [PATCH] 重构获取工单列表接口，查询条件中增加派单人ID和巡检员ID
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java | 12 ++++++++++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 16 ++++++++++++++++
2 files changed, 26 insertions(+), 2 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..bb25f7a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -269,6 +269,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>
@@ -317,6 +325,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>
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 984fa56..138e9f5 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
@@ -3,8 +3,6 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
/**
* @author ZhuBaoMin
@@ -22,11 +20,21 @@
private String dispatcher;
/**
+ * 娲惧崟浜篒D
+ */
+ private Long dispatcherId;
+
+ /**
* 宸℃鍛樺鍚�
*/
private String inspector;
/**
+ * 宸℃鍛業D
+ */
+ private Long inspectorId;
+
+ /**
* 鏌ヨ寮�濮嬫椂闂�
*/
private String timeStart;
--
Gitblit v1.8.0