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