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/app/task/domain/ArdAppTask.java | 168 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 110 insertions(+), 58 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
index 65f7bed..0a44a68 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
@@ -1,6 +1,11 @@
package com.ruoyi.app.task.domain;
+import java.util.Date;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -8,47 +13,104 @@
/**
* app任务管理对象 ard_app_task
- *
+ *
* @author ard
* @date 2023-07-22
*/
-public class ArdAppTask extends BaseEntity
-{
+public class ArdAppTask extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** ID */
+ /**
+ * ID
+ */
private String id;
-
- /** 任务名称 */
+ /**
+ * 任务类型 0-普通任务 1-报警任务
+ */
+ @Excel(name = "任务类型")
+ private String type;
+ /**
+ * 任务名称
+ */
@Excel(name = "任务名称")
private String name;
- /** 任务文本 */
+ /**
+ * 任务文本
+ */
@Excel(name = "任务文本")
private String text;
- /** 任务语音 */
+ /**
+ * 任务语音
+ */
@Excel(name = "任务语音")
private String voice;
- /** 部门ID */
+ /**
+ * 部门ID
+ */
@Excel(name = "部门ID")
private Integer deptId;
- /** 用户ID */
+ /**
+ * 用户ID
+ */
@Excel(name = "用户ID")
private String userId;
- /** app任务图片信息 */
+
+ /**
+ * app任务图片信息
+ */
+ @ApiModelProperty(notes = "app任务图片信息")
private List<ArdAppTaskPic> ardAppTaskPicList;
- /** app任务关联多用户 */
+ /**
+ * app任务关联多用户id列表
+ */
private List<String> userIds;
- /** app任务详情信息 */
+ /**
+ * app任务关联多用户
+ */
+ private List<SysUser> sysUserList;
+
+ /**
+ * app任务详情信息
+ */
+ @ApiModelProperty(notes = "app任务详情信息")
private List<ArdAppTaskDetail> ardAppTaskDetailList;
- public List<ArdAppTaskPic> getArdAppTaskPicList()
- {
+ /**
+ * app用户ID
+ */
+ private String appUserId;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getAppUserId() {
+ return appUserId;
+ }
+
+ public void setAppUserId(String appUserId) {
+ this.appUserId = appUserId;
+ }
+
+ public List<SysUser> getSysUserList() {
+ return sysUserList;
+ }
+
+ public void setSysUserList(List<SysUser> sysUserList) {
+ this.sysUserList = sysUserList;
+ }
+
+ public List<ArdAppTaskPic> getArdAppTaskPicList() {
return ardAppTaskPicList;
}
@@ -60,90 +122,80 @@
this.userIds = userIds;
}
- public void setArdAppTaskPicList(List<ArdAppTaskPic> ardAppTaskPicList)
- {
+ public void setArdAppTaskPicList(List<ArdAppTaskPic> ardAppTaskPicList) {
this.ardAppTaskPicList = ardAppTaskPicList;
}
- public void setId(String id)
- {
+ public void setId(String id) {
this.id = id;
}
- public String getId()
- {
+ public String getId() {
return id;
}
- public void setName(String name)
- {
+
+ public void setName(String name) {
this.name = name;
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setText(String text)
- {
+
+ public void setText(String text) {
this.text = text;
}
- public String getText()
- {
+ public String getText() {
return text;
}
- public void setVoice(String voice)
- {
+
+ public void setVoice(String voice) {
this.voice = voice;
}
- public String getVoice()
- {
+ public String getVoice() {
return voice;
}
- public void setDeptId(Integer deptId)
- {
+
+ public void setDeptId(Integer deptId) {
this.deptId = deptId;
}
- public Integer getDeptId()
- {
+ public Integer getDeptId() {
return deptId;
}
- public void setUserId(String userId)
- {
+
+ public void setUserId(String userId) {
this.userId = userId;
}
- public String getUserId()
- {
+ public String getUserId() {
return userId;
}
- public List<ArdAppTaskDetail> getArdAppTaskDetailList()
- {
+ public List<ArdAppTaskDetail> getArdAppTaskDetailList() {
return ardAppTaskDetailList;
}
- public void setArdAppTaskDetailList(List<ArdAppTaskDetail> ardAppTaskDetailList)
- {
+ public void setArdAppTaskDetailList(List<ArdAppTaskDetail> ardAppTaskDetailList) {
this.ardAppTaskDetailList = ardAppTaskDetailList;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("id", getId())
- .append("name", getName())
- .append("text", getText())
- .append("voice", getVoice())
- .append("deptId", getDeptId())
- .append("userId", getUserId())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("ardAppTaskDetailList", getArdAppTaskDetailList())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("id", getId())
+ .append("name", getName())
+ .append("text", getText())
+ .append("voice", getVoice())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("ardAppTaskDetailList", getArdAppTaskDetailList())
+ .toString();
}
}
--
Gitblit v1.9.3