From 21e4a0b0f9bae6e4be7afde67a524e47c87dbad0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 九月 2023 14:02:39 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 114 +++++++++++++++++++++++++-------------------------------
1 files changed, 51 insertions(+), 63 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 9cd8478..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,9 +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
@@ -11,87 +19,67 @@
* @author ard
* @date 2023-08-02
*/
-public class ArdAppPatrolplan extends BaseEntity
+@Data
+public class ArdAppPatrolplan
{
private static final long serialVersionUID = 1L;
- /** 缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
- @Excel(name = "缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙)")
- private String patroEndTime;
-
- /** 鍒跺畾浜轰富閿� */
- @Excel(name = "鍒跺畾浜轰富閿�")
- private String userId;
-
- /** 鍛ㄦ湡 */
- @Excel(name = "鍛ㄦ湡")
- private String cycle;
-
/** 涓婚敭 */
private String id;
+
+ /** 鍒跺畾浜轰富閿� */
+ private String userId;
+
+ @Excel(name = "鍒跺畾浜�")
+ @TableField(exist = false,select = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private String nickName;
+
+ /** 鍛ㄦ湡 */
+ @Excel(name = "鍛ㄦ湡",readConverterExp = "day=姣忔棩,once=鍗曟")
+ private String cycle;
/** 宸℃璁″垝鍚嶇О */
@Excel(name = "宸℃璁″垝鍚嶇О")
private String planName;
- /** 寮�濮嬫椂闂�(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
- @Excel(name = "寮�濮嬫椂闂�(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙)")
+ /** 寮�濮嬫椂闂� */
+ @Excel(name = "寮�濮嬫椂闂�")
private String patroBeginTime;
- public void setPatroEndTime(String patroEndTime)
- {
- this.patroEndTime = patroEndTime;
- }
+ /** 缁撴潫鏃堕棿(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙) */
+ @Excel(name = "缁撴潫鏃堕棿")
+ private String patroEndTime;
- public String getPatroEndTime()
- {
- return patroEndTime;
- }
- public void setUserId(String userId)
- {
- this.userId = userId;
- }
+ /**
+ * 宸℃鐐规煡璇㈡潯浠�
+ */
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private String wellId;
- public String getUserId()
- {
- return userId;
- }
- public void setCycle(String cycle)
- {
- this.cycle = cycle;
- }
+ /**
+ * 宸℃浜哄憳鏌ヨ鏉′欢
+ */
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private String pUser;
- public String getCycle()
- {
- return cycle;
- }
- public void setId(String id)
- {
- this.id = id;
- }
+ private String createTime;
- public String getId()
- {
- return id;
- }
- public void setPlanName(String planName)
- {
- this.planName = planName;
- }
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
- public String getPlanName()
- {
- return planName;
- }
- public void setPatroBeginTime(String patroBeginTime)
- {
- this.patroBeginTime = patroBeginTime;
- }
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
- public String getPatroBeginTime()
- {
- return patroBeginTime;
- }
+ private String delName;
+
+ private String delTime;
+
+ private String son;
@Override
public String toString() {
--
Gitblit v1.9.3