From 684d583978a4f0d4b0bd88ad46ad2f6238d185c8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 24 Apr 2023 16:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
index ffd28f5..5233283 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
@@ -3,6 +3,7 @@
 
 import cn.gistack.common.node.TreeNode;
 import cn.gistack.common.utils.NodeTreeUtil;
+import cn.gistack.sm.patrol.dto.PatrolGroupDTO;
 import cn.gistack.sm.patrol.entity.PatrolGroup;
 import cn.gistack.sm.patrol.mapper.PatrolGroupMapper;
 import cn.gistack.sm.patrol.service.IPatrolGroupService;
@@ -55,4 +56,14 @@
 	public List<PatrolGroupVO> getAllPatrolGroupByTaskId(String taskId) {
 		return baseMapper.getAllPatrolGroupByTaskId(taskId);
 	}
+
+	@Override
+	public List<PatrolGroupDTO> getPatrolGroupDTO(String taskId) {
+		return baseMapper.getPatrolGroupDTO(taskId);
+	}
+
+	@Override
+	public List<PatrolGroup> getPatrolGroupByTaskId(String taskId) {
+		return baseMapper.getPatrolGroupByTaskId(taskId);
+	}
 }

--
Gitblit v1.9.3