From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java
index 61c6ff7..3cd697d 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java
@@ -12,6 +12,7 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
+import com.android.app_base.utils.DateTimeConverter;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.PageResponseBean;
@@ -336,8 +337,8 @@
if (b) {
// 浠庢柊鍒版棫锛宯ull鎺掓渶鍚�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getDate1();
- String happenTime2 = o2.getDate2();
+ String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
+ String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
@@ -356,8 +357,8 @@
} else {
// 浠庢棫鍒版柊锛宯ull鎺掓渶鍓�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getDate1();
- String happenTime2 = o2.getDate2();
+ String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
+ String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
--
Gitblit v1.9.1