From b506a0a10cdf3ac34cfdae2b82da4dae49b41567 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 20 一月 2026 11:10:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/estate_expert

---
 admin-server/src/main/java/com/estate/expert/admin/service/OnDutyService.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/OnDutyService.java b/admin-server/src/main/java/com/estate/expert/admin/service/OnDutyService.java
index 42b0e97..7f26869 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/OnDutyService.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/OnDutyService.java
@@ -5,7 +5,12 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.estate.expert.admin.domain.business.onduty.OnDuty;
 import com.estate.expert.admin.domain.business.onduty.OnDutyVo;
+import com.estate.expert.admin.domain.common.request.AddOnDutyRequest;
+import com.estate.expert.admin.domain.common.request.EditOnDutyRequest;
 import com.estate.expert.admin.domain.common.request.OnDutyRequest;
+import com.estate.expert.admin.domain.common.request.PageReq;
+import com.estate.expert.admin.domain.common.response.PageRespMp;
+import com.estate.expert.admin.domain.user.User;
 
 import java.util.List;
 
@@ -24,4 +29,39 @@
 
     OnDutyVo detail(Integer id);
 
+    /**
+     * 添加在岗情况记录
+     *
+     * @param creator 创建者
+     * @param request 添加请求
+     * @return 在岗情况实体
+     */
+    OnDuty add(User creator, AddOnDutyRequest request);
+
+    /**
+     * 分页查询在岗情况列表(JPA 实现)
+     * 用于新的列表查询接口,支持"全部/我创建的"筛选
+     *
+     * @param planId 计划ID(可选)
+     * @param creatorId 创建者ID(null表示查询全部)
+     * @param pageReq 分页请求
+     * @return 在岗情况分页结果
+     */
+    PageRespMp<OnDuty> listOnDutyRecords(Integer planId, Integer creatorId, PageReq pageReq);
+
+    /**
+     * 编辑在岗情况记录
+     *
+     * @param request 编辑请求
+     * @return 更新后的在岗情况实体
+     */
+    OnDuty edit(EditOnDutyRequest request);
+
+    /**
+     * 批量删除在岗情况记录
+     *
+     * @param ids 在岗记录ID列表
+     */
+    void deleteByIds(List<Integer> ids);
+
 }

--
Gitblit v1.7.1