From f7b45d5f823d9033c7117384436f255e972b4c31 Mon Sep 17 00:00:00 2001 From: niushuai233 Date: Fri, 8 Dec 2023 16:15:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:+1:=20=E4=BD=BF=E7=94=A8check=5Fdate?= =?UTF-8?q?=20=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/niushuai/didicheck/biz/dao/CheckRecordDao.java | 6 +++--- .../didicheck/ui/main/home/HomeRecycleViewAdapter.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/cc/niushuai/didicheck/biz/dao/CheckRecordDao.java b/app/src/main/java/cc/niushuai/didicheck/biz/dao/CheckRecordDao.java index 5b455e0..7bb0909 100644 --- a/app/src/main/java/cc/niushuai/didicheck/biz/dao/CheckRecordDao.java +++ b/app/src/main/java/cc/niushuai/didicheck/biz/dao/CheckRecordDao.java @@ -14,14 +14,14 @@ import io.reactivex.Flowable; @Dao public interface CheckRecordDao { - @Query("SELECT * FROM t_check_record order by check_date desc") + @Query("SELECT * FROM t_check_record order by check_date desc, create_date desc") Flowable> listAll(); - @Query("select * from t_check_record where deleted = 0 and check_date = :date order by check_date desc") + @Query("select * from t_check_record where deleted = 0 and check_date = :date order by check_date desc, create_date desc") Flowable> queryByDate(long date); - @Query("select * from t_check_record where deleted = 0 and create_date >= :startDate and create_date <= :endDate order by check_date desc") + @Query("select * from t_check_record where deleted = 0 and create_date >= :startDate and create_date <= :endDate order by check_date desc, create_date desc") Flowable> queryByDate(long startDate, long endDate); diff --git a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java index 2537458..74f4164 100644 --- a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java +++ b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java @@ -46,7 +46,7 @@ public class HomeRecycleViewAdapter extends RecyclerView.Adapter