From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
index 4af75ac..cb00271 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
@@ -1,8 +1,12 @@
 package cn.gistack.sm.patrol.vo;
 
 import cn.gistack.sm.patrol.entity.PatrolGroupItem;
+import cn.gistack.sm.patrol.entity.PatrolRecord;
 import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
 import lombok.Data;
+
+import java.util.List;
 
 /**
  * 巡查组明细 vo
@@ -11,9 +15,42 @@
  */
 @Data
 public class PatrolTaskVO extends PatrolTask {
+	/**
+	 * 巡检人员名称
+	 */
+	private String toUserName;
 
 	/**
 	 * 任务类型名称
 	 */
 	private String patrolTypeName;
+
+	/**
+	 * 巡查路线
+	 */
+	private String routeRange;
+
+	/**
+	 * 历时
+	 */
+	private Integer timeGap;
+
+	/**
+	 * 角色名
+	 */
+	private String roleName;
+
+	/**
+	 * 当前用户id
+	 */
+	private String currentUserId;
+
+	private String taskUser;
+
+	/**
+	 * 是否返回已完成的任务
+	 */
+	private String finish;
+
+	private List<PatrolRecord> patrolRecordList;
 }

--
Gitblit v1.9.3