From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
index 2a06551..d30d151 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
@@ -32,7 +32,6 @@
private String endTime;
/** 重复周期 */
- @Excel(name = "重复周期")
private String repeatPeriod;
/** 巡检模式 */
@@ -51,21 +50,17 @@
@Excel(name = "通道号")
private Integer channel;
- /** 当前步骤 */
- @Excel(name = "当前步骤")
- private String currentStepId;
-
- /** 当前步骤开始时间 */
- @Excel(name = "当前步骤开始时间")
- private String currentStepStartTime;
-
/** 部门id */
- @Excel(name = "部门id")
private String deptId;
/** 用户id */
- @Excel(name = "用户id")
private String userId;
+
+ /** 当前步骤 */
+ private String currentStepId;
+
+ /** 当前步骤开始时间 */
+ private String currentStepStartTime;
/** 视频巡检步骤信息 */
private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
@@ -142,32 +137,14 @@
{
return cameraId;
}
- public void setChannel(Integer channel)
+ public void setChannel(Integer channel)
{
this.channel = channel;
}
- public Integer getChannel()
+ public Integer getChannel()
{
return channel;
- }
- public void setCurrentStepId(String currentStepId)
- {
- this.currentStepId = currentStepId;
- }
-
- public String getCurrentStepId()
- {
- return currentStepId;
- }
- public void setCurrentStepStartTime(String currentStepStartTime)
- {
- this.currentStepStartTime = currentStepStartTime;
- }
-
- public String getCurrentStepStartTime()
- {
- return currentStepStartTime;
}
public void setDeptId(String deptId)
{
@@ -186,6 +163,24 @@
public String getUserId()
{
return userId;
+ }
+ public void setCurrentStepId(String currentStepId)
+ {
+ this.currentStepId = currentStepId;
+ }
+
+ public String getCurrentStepId()
+ {
+ return currentStepId;
+ }
+ public void setCurrentStepStartTime(String currentStepStartTime)
+ {
+ this.currentStepStartTime = currentStepStartTime;
+ }
+
+ public String getCurrentStepStartTime()
+ {
+ return currentStepStartTime;
}
public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
@@ -209,15 +204,15 @@
.append("inspectMode", getInspectMode())
.append("menualSwitch", getMenualSwitch())
.append("createBy", getCreateBy())
- .append("cameraId", getCameraId())
- .append("channel", getChannel())
- .append("currentStepId", getCurrentStepId())
- .append("currentStepStartTime", getCurrentStepStartTime())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("cameraId", getCameraId())
+ .append("channel", getChannel())
.append("deptId", getDeptId())
.append("userId", getUserId())
+ .append("currentStepId", getCurrentStepId())
+ .append("currentStepStartTime", getCurrentStepStartTime())
.append("ardVideoInspectTaskStepList", getArdVideoInspectTaskStepList())
.toString();
}
--
Gitblit v1.9.3