From 382a0bfc97e948b851a6be793e87081c776e4cfc Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 18 四月 2024 10:56:46 +0800
Subject: [PATCH] 巡检计划

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 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..1593b6e 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,20 +1,26 @@
 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
- * 
+ *
  * @author ard
  * @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,41 @@
     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;
+
+    @TableField(exist = false)
+    private String createTimeBegin;
+
+    @TableField(exist = false)
+    private String createTimeEnd;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

--
Gitblit v1.9.3