From ad31fa93abe524baec2216f9b2f203acb8cc2d6a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 29 七月 2024 11:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index e44019b..6f29f18 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -8,6 +8,9 @@
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.form.WorkOrderForm;
import java.util.List;
+
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
+import com.ycl.platform.domain.vo.YwPointJobVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -20,8 +23,14 @@
@Mapper
public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
- void page(IPage page, @Param("query") WorkOrderQuery query);
+ IPage<WorkOrderVO> page(IPage page, @Param("query") WorkOrderQuery query);
- List<WorkOrderVO> distributePage(@Param("query") DistributeWorkOrderQuery query);
+ IPage<WorkOrderVO> distributePage(IPage page, @Param("query") DistributeWorkOrderQuery query);
+ /**
+ * 澶勭悊涓殑宸ュ崟
+ *
+ * @return
+ */
+ List<YwPointJobVO> handlingWorkOrderList();
}
--
Gitblit v1.8.0