From 4e97c398243b00e05d8d68e850dcd69c42b0cc76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 10 May 2023 10:30:10 +0800
Subject: [PATCH] 巡检任务增加水库名字段；添加查询水库详情的接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 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 d862c1c..67494ce 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
@@ -1,5 +1,7 @@
package cn.gistack.sm.patrol.entity;
+import cn.gistack.flow.core.entity.FlowEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -12,14 +14,14 @@
import org.springframework.format.annotation.DateTimeFormat;
/**
- * @Description: 巡查类型
+ * @Description: 巡查任务
*/
@Data
@TableName("sm_patrol_task")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "sm_patrol_task对象", description = "巡查任务")
-public class PatrolTask extends TenantEntity {
+public class PatrolTask extends FlowEntity {
/**
* 标题
*/
@@ -85,8 +87,76 @@
private String projectId;
/**
+ * 水库名
+ */
+ @ApiModelProperty(value = "水库名")
+ private String reservoirName;
+
+ /**
* 巡查项ID
*/
@ApiModelProperty(value = "巡查项ID(多个)")
private String patrolGroupItemId;
+
+
+ /**
+ * 路线空间数据
+ */
+ @ApiModelProperty(value = "路线空间数据")
+ private String routeCoordinates;
+
+ /**
+ * 实际巡查开始时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "实际巡查开始时间")
+ private String realStartTime;
+
+ /**
+ * 实际巡查结束时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "实际巡查结束时间")
+ private String realEndTime;
+
+ /**
+ * 里程
+ */
+ @ApiModelProperty(value = "里程")
+ private String mile;
+
+ /**
+ * 问题数量
+ */
+ @ApiModelProperty(value = "问题数量")
+ private Integer problemCount;
+
+ /**
+ * 流程定义id
+ */
+ private String processDefinitionId;
+ /**
+ * 流程实例id
+ */
+ private String processInstanceId;
+
+ /**
+ * 工作流标识 是否上报
+ */
+ @TableField(exist = false)
+ private Boolean report;
+
+ /**
+ * 工作流标识 是否上报至部门
+ */
+ @TableField(exist = false)
+ private Boolean toDept;
+
+ /**
+ * 工作流标识 是否转送至技术负责人
+ */
+ @TableField(exist = false)
+ private Boolean toTech;
}
--
Gitblit v1.9.3