From b7a67e4c93b4cc12f0b0f019d08a39dce65fa3bb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 18:58:49 +0800
Subject: [PATCH] 工单分页bug
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 6 ++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index 7ad69ca..a6c123a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -46,6 +46,6 @@
/**
* 鐘舵��
*/
- private WorkOrderStatusEnum status;
+ private String status;
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index d090669..a8b4dc1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -49,10 +49,12 @@
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
- <if test="query.status != null">
+ <if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
- <!-- 娉ㄦ剰锛氳繖閲岀Щ闄や簡瀵筿uery.errorType鐨勭洿鎺ユ煡璇紝鍥犱负瀹冪幇鍦ㄩ�氳繃JOIN鍜孏ROUP_CONCAT澶勭悊 -->
+ <if test="query.status == null or query.status == ''">
+ AND wo.status = 'DISTRIBUTED'
+ </if>
<if test="query.start != null">
AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
</if>
--
Gitblit v1.8.0