From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成

---
 app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaRequestBean.java |   59 +++++++++++++++++++----------------------------------------
 1 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaRequestBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaRequestBean.java
index 3440681..6100a2e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaRequestBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaRequestBean.java
@@ -8,15 +8,14 @@
  * @date 2023.03.28. 15:57
  * @desc
  */
-public class FamilyMemorabiliaRequestBean {
+public class FamilyMemorabiliaRequestBean extends PageRequestBean{
     private String people;
     private String address;
     private String remark;
     private String title;
 
-    private String createTime;
-    private int pageNum = 1;
-    private int pageSize = 20;
+    private String happenStartTime;
+    private String happenEndTime;
 
     public String getPeople() {
         return people;
@@ -50,51 +49,31 @@
         this.title = title;
     }
 
-    public int getPageNum() {
-        return pageNum;
+
+    public String getHappenStartTime() {
+        return happenStartTime;
     }
 
-    public void setPageNum(int pageNum) {
-        this.pageNum = pageNum;
+    public void setHappenStartTime(String happenStartTime) {
+        this.happenStartTime = happenStartTime;
     }
 
-    public int getPageSize() {
-        return pageSize;
+    public String getHappenEndTime() {
+        return happenEndTime;
     }
 
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-    public String getCreateTime() {
-        return createTime;
+    public void setHappenEndTime(String happenEndTime) {
+        this.happenEndTime = happenEndTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public Map<String, Object> getMap() {
+    public Map<String, Object> toMap() {
         Map<String, Object> map = new HashMap<>();
-        if (people == null) {
-            people = "";
-        }
-        if (address == null) {
-            address = "";
-        }
-        if (remark == null) {
-            remark = "";
-        }
-        if (title == null) {
-            title = "";
-        }
-        if (createTime == null) {
-            createTime = "";
-        }
-        map.put("people", people);
-        map.put("address", address);
-        map.put("remark", remark);
-        map.put("title", title);
-        map.put("createTime", createTime);
+        map.put("people", people == null ? "" : people);
+        map.put("address", address == null ? "" : address);
+        map.put("remark", remark == null ? "" : remark);
+        map.put("title", title == null ? "" : title);
+        map.put("happenStartTime", happenStartTime == null ? "" : happenStartTime);
+        map.put("happenEndTime", happenEndTime == null ? "" : happenEndTime);
         map.put("pageNum", pageNum);
         map.put("pageSize", pageSize);
         return map;

--
Gitblit v1.9.1