From c79b1ebed5a42a4cbb2f824232da2a51ff22a9a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 十二月 2021 18:25:08 +0800
Subject: [PATCH] 功能完善

---
 app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java b/app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java
index c78c984..76b608a 100644
--- a/app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java
+++ b/app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java
@@ -1,6 +1,9 @@
 package com.yeshi.location.app.entity.location;
 
+import com.google.gson.annotations.Expose;
+import com.yeshi.location.app.vo.user.SimpleUserInfo;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.yeshi.utils.generater.annotation.admin.AdminController;
@@ -22,6 +25,25 @@
 public class LocationUsers implements Serializable {
 
     //瀹氫綅閭�璇风姸鎬�
+    public enum LocationUserType {
+        father("鐖朵翰"),
+        mother("姣嶄翰"),
+        husband("涓堝か"),
+        wife("濡诲瓙"),
+        daughter("濂冲効"),
+        son("鍎垮瓙"),
+        other("鍏朵粬浜�");
+        private String name;
+
+        private LocationUserType(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
     public enum LocationInviteStatus {
         sentInvite("绛夊緟瀵规柟搴旂瓟"),
         agree("瀵规柟宸插悓鎰�"),
@@ -38,6 +60,8 @@
         }
     }
 
+
+    @Expose
     @Show(title = "ID")
     @Id
     private String id;
@@ -47,18 +71,27 @@
     @Indexed
     private Long uid;
 
+    @Expose
     @Show(title = "鐩爣鐢ㄦ埛ID")
     @DaoQueryCondition
     @Indexed
     private Long targetUid;
 
+    @Expose
     @Show(title = "鐩爣鐢ㄦ埛鍚嶇О")
     private String targetName;
 
+    @Expose
+    private String targetPhone;
+
+    @Expose
     @Show(title = "鐘舵��")
     @DaoQueryCondition
     @Indexed
     private LocationInviteStatus status;
+
+    @Expose
+    private LocationUserType userType;
 
     @Show(title = "鍙戦�佺殑娆℃暟")
     private Integer sentCount;
@@ -71,6 +104,11 @@
     @Indexed
     private Date accessTime;
 
+    @Show(title = "鎷掔粷鏃堕棿")
+    @DaoQueryCondition
+    @Indexed
+    private Date rejectTime;
+
     @Show(title = "鍒涘缓鏃堕棿")
     @DaoQueryCondition
     @Indexed
@@ -78,6 +116,11 @@
 
     @Show(title = "鏇存柊鏃堕棿")
     private Date updateTime;
+
+
+    @Transient
+    @Expose
+    private SimpleUserInfo userInfo;
 
 
     public static String createId(Long uid, Long targetUid) {
@@ -163,4 +206,36 @@
     public void setSentCount(Integer sentCount) {
         this.sentCount = sentCount;
     }
+
+    public Date getRejectTime() {
+        return rejectTime;
+    }
+
+    public void setRejectTime(Date rejectTime) {
+        this.rejectTime = rejectTime;
+    }
+
+    public LocationUserType getUserType() {
+        return userType;
+    }
+
+    public void setUserType(LocationUserType userType) {
+        this.userType = userType;
+    }
+
+    public String getTargetPhone() {
+        return targetPhone;
+    }
+
+    public void setTargetPhone(String targetPhone) {
+        this.targetPhone = targetPhone;
+    }
+
+    public SimpleUserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(SimpleUserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }

--
Gitblit v1.8.0