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 | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 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 104d86d..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 @@ -4,6 +4,7 @@ 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; @@ -57,9 +58,22 @@ */ boolean startProcess(PatrolTask patrolTask); - boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser); + 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); } -- Gitblit v1.9.3