From 3249419e192b8ca3c31e5d14a2daac3a4a2352c6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 14 八月 2023 09:59:25 +0800
Subject: [PATCH] app任务下发增加任务类型0-普通任务 1-报警任务

---
 ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java |  142 +++++++++++++++++++++++++++--------------------
 1 files changed, 82 insertions(+), 60 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 fda8a46..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
@@ -13,53 +13,86 @@
 
 /**
  * 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浠诲姟鍏宠仈澶氱敤鎴穒d鍒楄〃 */
+    /**
+     * app浠诲姟鍏宠仈澶氱敤鎴穒d鍒楄〃
+     */
     private List<String> userIds;
 
-    /** app浠诲姟鍏宠仈澶氱敤鎴� */
+    /**
+     * app浠诲姟鍏宠仈澶氱敤鎴�
+     */
     private List<SysUser> sysUserList;
 
-    /** app浠诲姟璇︽儏淇℃伅 */
+    /**
+     * app浠诲姟璇︽儏淇℃伅
+     */
     @ApiModelProperty(notes = "app浠诲姟璇︽儏淇℃伅")
     private List<ArdAppTaskDetail> ardAppTaskDetailList;
 
-    /** app鐢ㄦ埛ID */
+    /**
+     * app鐢ㄦ埛ID
+     */
     private String appUserId;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public String getAppUserId() {
         return appUserId;
@@ -77,8 +110,7 @@
         this.sysUserList = sysUserList;
     }
 
-    public List<ArdAppTaskPic> getArdAppTaskPicList()
-    {
+    public List<ArdAppTaskPic> getArdAppTaskPicList() {
         return ardAppTaskPicList;
     }
 
@@ -90,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