From 8076c8149bbbe517cf3986faecbc07dd3df25b07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 11:06:00 +0800
Subject: [PATCH] 下发分页增加关键词、状态搜索
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 4 +++-
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java | 11 +++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 1 +
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
index 86eeeca..c1f4c82 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.FastDistributeTypeEnum;
+import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
@@ -36,5 +37,15 @@
@JsonProperty("ids")
private List<Integer> ids;
+ /**
+ * 鍏抽敭璇�
+ */
+ private String keyword;
+
+ /**
+ * 宸ュ崟鐘舵��
+ */
+ private String status;
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 3e25f5b..bf1c716 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -268,6 +268,7 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ // todo 鍏抽敭璇嶆悳绱�
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 5b6c6f0..478d8ff 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -52,10 +52,12 @@
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
where
wo.deleted = '0'
- and wo.status = 'WAIT_DISTRIBUTE'
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
ORDER BY wo.create_time DESC
</select>
--
Gitblit v1.8.0