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/patrolplan/domain/ArdAppPatrolplan.java | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 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 5a39143..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,45 +20,67 @@
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolplan extends BaseEntity
+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;
+ /** 结束时间(每天为时分秒，仅一次为年月日时分秒) */
+ @Excel(name = "结束时间")
+ 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