From c680e9ae370e75fbf90d54192d0f6cf2e8fc619a Mon Sep 17 00:00:00 2001 From: xiebin <vip_xiaobin810@163.com> Date: Thu, 22 Jan 2026 16:58:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 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..bf470d7 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,10 +18,14 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity; +import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum; +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; import org.springblade.core.mp.base.BaseService; +import java.io.File; import java.util.List; /** @@ -38,7 +42,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 +62,24 @@ /** * 审核巡查任务 - * @param id 任务ID - * @param auditStatus 审核状态：4审核通过、5审核拒绝 - * @param rejectReason 拒绝原因（审核拒绝时必填） + * @param auditParam * @return */ - boolean auditPatrolTask(Long id, String auditStatus, String rejectReason); + boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam); + + /** + * 更新单个巡查任务信息 + * @param taskEntity 巡查任务实体 + * @return 更新后的任务状态枚举 + */ + boolean republishPatrolTask(GdPatrolTaskEntity taskEntity); + + /** + * 生成巡查报告 + * + * @param patrolTaskId 巡查任务主键 + * @return 报告文件 + */ + File exportPatrolReport(Long patrolTaskId); + } -- Gitblit v1.9.3