From fc030d197a869d5fecab582d36ff17be7e67cc3f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Apr 2023 15:41:22 +0800
Subject: [PATCH] 巡查工作流接入
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 12 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 80a2496..5ead2ed 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,51 +14,143 @@
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 {
- /**标题*/
+@ApiModel(value = "sm_patrol_task对象", description = "巡查任务")
+public class PatrolTask extends FlowEntity {
+ /**
+ * 标题
+ */
@ApiModelProperty(value = "标题")
private String title;
- /**开始时间*/
+ /**
+ * 开始时间
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始时间")
private String startTime;
- /**结束时间*/
+ /**
+ * 结束时间
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "结束时间")
private String endTime;
- /**内容*/
+ /**
+ * 内容
+ */
@ApiModelProperty(value = "内容")
private String content;
- /**巡检人员*/
+ /**
+ * 巡检人员
+ */
@ApiModelProperty(value = "巡检人员")
private String toUserId;
- /**路线id*/
+ /**
+ * 路线id
+ */
@ApiModelProperty(value = "路线id")
private String routeId;
- /**任务状态*/
+ /**
+ * 任务状态
+ */
@ApiModelProperty(value = "任务状态")
private String state;
- /**任务来源*/
+ /**
+ * 任务来源
+ */
@ApiModelProperty(value = "任务来源")
private String source;
- /**任务类型*/
+ /**
+ * 任务类型
+ */
@ApiModelProperty(value = "任务类型")
private String taskType;
+
+ /**
+ * 水库id
+ */
+ @ApiModelProperty(value = "水库id")
+ private String projectId;
+
+ /**
+ * 巡查项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