From 4b61f417607c539fa58a67fa61f9f35d7ddb6b88 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 九月 2023 15:12:29 +0800
Subject: [PATCH] 雷达报警增加时间动态筛选
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
index 8700302..a4867f8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
@@ -1,11 +1,17 @@
package com.ruoyi.app.patrolplan.domain;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
/**
* app宸℃璁″垝瀵硅薄 ard_app_patrolplan
@@ -14,7 +20,7 @@
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolplan extends BaseEntity
+public class ArdAppPatrolplan
{
private static final long serialVersionUID = 1L;
@@ -25,6 +31,8 @@
private String userId;
@Excel(name = "鍒跺畾浜�")
+ @TableField(exist = false,select = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String nickName;
/** 鍛ㄦ湡 */
@@ -44,17 +52,35 @@
private String patroEndTime;
/**
- * 宸℃鐐�
+ * 宸℃鐐规煡璇㈡潯浠�
*/
- @TableField(exist = false)
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String wellId;
/**
- * 宸℃浜哄憳
+ * 宸℃浜哄憳鏌ヨ鏉′欢
*/
- @TableField(exist = false)
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String pUser;
+ private String createTime;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
+
+ private String delName;
+
+ private String delTime;
+
+ private String son;
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3