From 4f015b8c624484e0c3b2d88b944163ce43a48d1f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 十一月 2021 17:15:28 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/location/app/entity/location/LocationUsers.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 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 82943b7..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,7 +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;
@@ -23,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 +59,7 @@
return desc;
}
}
+
@Expose
@Show(title = "ID")
@@ -60,10 +82,16 @@
private String targetName;
@Expose
+ private String targetPhone;
+
+ @Expose
@Show(title = "鐘舵��")
@DaoQueryCondition
@Indexed
private LocationInviteStatus status;
+
+ @Expose
+ private LocationUserType userType;
@Show(title = "鍙戦�佺殑娆℃暟")
private Integer sentCount;
@@ -88,6 +116,11 @@
@Show(title = "鏇存柊鏃堕棿")
private Date updateTime;
+
+
+ @Transient
+ @Expose
+ private SimpleUserInfo userInfo;
public static String createId(Long uid, Long targetUid) {
@@ -181,4 +214,28 @@
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