From 27b27564be25fd92edfe328a0e989ee8f4c4e7d3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Mar 2024 15:23:28 +0800
Subject: [PATCH] 任务查询，按创建时间查询；白蚁大坝汛前巡查流程
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 a0abc63..f30f878 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
@@ -3,8 +3,7 @@
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.PatrolTaskVO;
+import cn.gistack.sm.patrol.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
@@ -55,13 +54,41 @@
* @param patrolTask 任务实体
* @return boolean
*/
- boolean startProcess(PatrolTask patrolTask);
+ PatrolTask startProcess(PatrolTask patrolTask);
boolean patrolCompleteTask(PatrolTaskVO patrolTaskVO,String currentUserId,String taskUser);
boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);
- PatrolTask customizeGetById(String businessId);
+ 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);
+
+ List<TaskStatusCount> getTaskStatusCount(PatrolTaskVO patrolTaskVO);
+
+ List<TaskStatusCount> getTaskTypeCount(PatrolTaskVO patrolTaskVO);
+
+ List<TaskStatusCount> getTaskStatusCountOptimize(PatrolTaskVO patrolTaskVO);
+
+ TaskStatus getTaskStatus(PatrolTaskVO patrolTaskVO);
+
+ /**
+ * 汛期、白蚁、大坝 责任人完成任务
+ * @param patrolTaskVO
+ * @param currentUserId
+ * @param taskUser
+ * @return
+ */
+ boolean personCompleteTask(PatrolTaskVO patrolTaskVO, String currentUserId, String taskUser);
}
--
Gitblit v1.9.3