From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java | 135 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 46 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java
index 4ee7a4f..95e4232 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java
@@ -1,5 +1,8 @@
package com.application.zhangshi_app_android.bean;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
import java.io.Serializable;
/**
@@ -10,33 +13,29 @@
public class CleanStorageBean implements Serializable {
//搴忓彿
private int id;
- //绫诲瀷
- private String type;
+ //绫诲瀷 0.淇濇磥 1.鏀剁撼
+ private int kind;
//閫傜敤浜�
- private String suitablePeople;
+ private String suitable;
//绫诲埆
- private String category;
+ private String type;
//淇濇磥鏂规硶
- private String cleanMethod;
+ private String method;
//鏉愭枡瀛樻斁鍦�
- private String materialStorageLocation;
+ private String place;
//鏀剧疆鍦扮偣
- private String placementLocation;
+ private String location;
//澶囨敞
private String remark;
private String url;
+ //瀹跺涵id
+ private transient String familyId;
+ //鍒涘缓鏃堕棿
+ private String createTime;
+ //鍙戠敓鏃堕棿
+ private String happenTime;
- public CleanStorageBean(int id, String type, String suitablePeople, String category, String cleanMethod, String materialStorageLocation, String placementLocation, String remark, String url) {
- this.id = id;
- this.type = type;
- this.suitablePeople = suitablePeople;
- this.category = category;
- this.cleanMethod = cleanMethod;
- this.materialStorageLocation = materialStorageLocation;
- this.placementLocation = placementLocation;
- this.remark = remark;
- this.url = url;
- }
+ private int ownData = 1;//鏄惁鏄嚜宸卞搴殑鏁版嵁 1 鏄� 0 涓嶆槸
public int getId() {
return id;
@@ -44,6 +43,30 @@
public void setId(int id) {
this.id = id;
+ }
+
+
+ public void setKind(String kind) {
+ if (kind.equals("鏀剁撼")) {
+ this.kind = 1;
+ } else{
+ this.kind = 0;
+ }
+ }
+ public String getKind() {
+ if (kind == 1) {
+ return "鏀剁撼";
+ } else {
+ return "淇濇磥";
+ }
+ }
+
+ public String getSuitable() {
+ return suitable;
+ }
+
+ public void setSuitable(String suitable) {
+ this.suitable = suitable;
}
public String getType() {
@@ -54,44 +77,28 @@
this.type = type;
}
- public String getSuitablePeople() {
- return suitablePeople;
+ public String getMethod() {
+ return method;
}
- public void setSuitablePeople(String suitablePeople) {
- this.suitablePeople = suitablePeople;
+ public void setMethod(String method) {
+ this.method = method;
}
- public String getCategory() {
- return category;
+ public String getPlace() {
+ return place;
}
- public void setCategory(String category) {
- this.category = category;
+ public void setPlace(String place) {
+ this.place = place;
}
- public String getCleanMethod() {
- return cleanMethod;
+ public String getLocation() {
+ return location;
}
- public void setCleanMethod(String cleanMethod) {
- this.cleanMethod = cleanMethod;
- }
-
- public String getMaterialStorageLocation() {
- return materialStorageLocation;
- }
-
- public void setMaterialStorageLocation(String materialStorageLocation) {
- this.materialStorageLocation = materialStorageLocation;
- }
-
- public String getPlacementLocation() {
- return placementLocation;
- }
-
- public void setPlacementLocation(String placementLocation) {
- this.placementLocation = placementLocation;
+ public void setLocation(String location) {
+ this.location = location;
}
public String getRemark() {
@@ -109,4 +116,40 @@
public void setUrl(String url) {
this.url = url;
}
+
+ public String getFamilyId() {
+ return familyId;
+ }
+
+ public void setFamilyId(String familyId) {
+ this.familyId = familyId;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public void setKind(int kind) {
+ this.kind = kind;
+ }
+
+ public int getOwnData() {
+ return ownData;
+ }
+
+ public void setOwnData(int ownData) {
+ this.ownData = ownData;
+ }
+
+ public String getHappenTime() {
+ return happenTime;
+ }
+
+ public void setHappenTime(String happenTime) {
+ this.happenTime = happenTime;
+ }
}
--
Gitblit v1.9.1