From f04487fef5ac47380dfa9670156743c9d273966b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 23 Mar 2024 15:54:40 +0800
Subject: [PATCH] 巡查修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
index 5ead2ed..f0f6c0e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
@@ -21,7 +21,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "sm_patrol_task对象", description = "巡查任务")
-public class PatrolTask extends FlowEntity {
+public class PatrolTask extends BaseEntity {
/**
* 标题
*/
@@ -87,6 +87,12 @@
private String projectId;
/**
+ * 水库名
+ */
+ @ApiModelProperty(value = "水库名")
+ private String reservoirName;
+
+ /**
* 巡查项ID
*/
@ApiModelProperty(value = "巡查项ID(多个)")
@@ -98,6 +104,12 @@
*/
@ApiModelProperty(value = "路线空间数据")
private String routeCoordinates;
+
+ /**
+ * 巡检路线
+ */
+ @ApiModelProperty(value = "巡检路线")
+ private String patrolRoute;
/**
* 实际巡查开始时间
@@ -128,29 +140,43 @@
private Integer problemCount;
/**
- * 流程定义id
+ * 上报问题数量
*/
- private String processDefinitionId;
- /**
- * 流程实例id
- */
- private String processInstanceId;
+ @ApiModelProperty(value = "上报问题数量")
+ private Integer reportProblemCount;
/**
- * 工作流标识 是否上报
+ * 巡查角色
*/
- @TableField(exist = false)
- private Boolean report;
+ private String patrolRole;
- /**
- * 工作流标识 是否上报至部门
- */
- @TableField(exist = false)
- private Boolean toDept;
+// /**
+// * 流程定义id
+// */
+// private String processDefinitionId;
+// /**
+// * 流程实例id
+// */
+// private String processInstanceId;
- /**
- * 工作流标识 是否转送至技术负责人
- */
- @TableField(exist = false)
- private Boolean toTech;
+ //处理状态，1、巡查；2、处理中；3已处理
+ private String handleStatus;
+
+// /**
+// * 工作流标识 是否上报
+// */
+// @TableField(exist = false)
+// private Boolean report;
+//
+// /**
+// * 工作流标识 是否上报至部门
+// */
+// @TableField(exist = false)
+// private Boolean toDept;
+//
+// /**
+// * 工作流标识 是否转送至技术负责人
+// */
+// @TableField(exist = false)
+// private Boolean toTech;
}
--
Gitblit v1.9.3