From cdc60b89add7a32ee458c4b9c27acfdf40fc14fd Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Tue, 20 Jan 2026 15:02:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java index 5e945dd..acdd69c 100644 --- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java +++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java @@ -18,6 +18,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity; +import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam; +import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam; import org.sxkj.gd.workorder.vo.GdPatrolTaskVO; import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,7 +40,7 @@ * @param gdPatrolTask * @return */ - IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask); + IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList); /** @@ -58,10 +60,8 @@ /** * 审核巡查任务 - * @param id 任务ID - * @param auditStatus 审核状态：4审核通过、5审核拒绝 - * @param rejectReason 拒绝原因（审核拒绝时必填） + * @param auditParam * @return */ - boolean auditPatrolTask(Long id, String auditStatus, String rejectReason); + boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam); } -- Gitblit v1.9.3