From 269ed22bc4dc1ed182a9aaf04d717176881f040d Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 07 八月 2023 14:07:36 +0800
Subject: [PATCH] 获取单个计划
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..a1598f1 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,16 @@
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.List;
/**
* app宸℃璁″垝瀵硅薄 ard_app_patrolplan
@@ -25,6 +30,8 @@
private String userId;
@Excel(name = "鍒跺畾浜�")
+ @TableField(exist = false,select = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String nickName;
/** 鍛ㄦ湡 */
@@ -44,16 +51,30 @@
private String patroEndTime;
/**
- * 宸℃鐐�
+ * 宸℃鐐规煡璇㈡潯浠�
*/
- @TableField(exist = false)
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String wellId;
/**
- * 宸℃浜哄憳
+ * 宸℃浜哄憳鏌ヨ鏉′欢
+ */
+ @TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private String pUser;
+
+ /**
+ * 宸℃鐐归泦鍚�
*/
@TableField(exist = false)
- private String pUser;
+ private List<ArdAlarmpointsWell> wellList;
+
+ /**
+ * 宸℃浜洪泦鍚�
+ */
+ @TableField(exist = false)
+ private List<SysUser> userList;
@Override
public String toString() {
--
Gitblit v1.9.3