From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java |   72 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
index 9156b54..04e6ca5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -1,9 +1,79 @@
 package cn.gistack.sm.patrol.service;
 
+import cn.gistack.flow.core.entity.BladeFlow;
+import cn.gistack.sm.patrol.entity.PatrolReport;
 import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.patrol.vo.BladeFlowTask;
+import cn.gistack.sm.patrol.vo.PatrolTaskReport;
+import cn.gistack.sm.patrol.vo.PatrolTaskVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 
+import java.net.http.HttpRequest;
+import java.util.List;
+
 public interface IPatrolTaskService extends BaseService<PatrolTask> {
-	IPage<PatrolTask> selectPatrolTask(IPage<PatrolTask> page, PatrolTask patrolTask);
+
+	/**
+	 * 自定义分页查询
+	 * @param page
+	 * @param patrolTask
+	 * @return
+	 */
+	IPage<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page, PatrolTaskVO patrolTask);
+
+	/**
+	 * 查询巡查人员统计数据信息
+	 * @param patrolTask
+	 * @return
+	 */
+    Object getPatrolTaskStatistic(PatrolTaskVO patrolTask);
+
+	/**
+	 * 自定义编辑(空间坐标编辑)
+	 * @param patrolTask
+	 * @return
+	 */
+	Boolean updatePatrolTask(PatrolTask patrolTask);
+
+	/**
+	 * 自定义添加
+	 * @param patrolTask
+	 * @return
+	 */
+	Boolean savePatrolTask(PatrolTask patrolTask);
+
+	/**
+	 * 自定义通过id查询
+	 * @param id
+	 * @return
+	 */
+	PatrolTask getPatrolTaskById(String id);
+
+	/**
+	 * 开启流程
+	 *
+	 * @param patrolTask 任务实体
+	 * @return boolean
+	 */
+	boolean startProcess(PatrolTask patrolTask);
+
+	boolean patrolCompleteTask(PatrolTaskVO patrolTaskVO,String currentUserId,String taskUser);
+
+	boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);
+
+	PatrolTaskVO customizeGetById(String businessId);
+
+    List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO);
+
+	/**
+	 * 获取巡查报表
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport);
+
+	IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport);
+
+	List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport);
 }

--
Gitblit v1.9.3