From e3783b167f132005c7afcc4c10f9ab167806331d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 04 三月 2025 13:22:04 +0800
Subject: [PATCH] fix: 按天统计相关逻辑
---
app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt b/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
index d86d5c1..343140a 100644
--- a/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
+++ b/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
@@ -64,36 +64,38 @@
@Query("SELECT * FROM code WHERE date(createtime) = date(:date/1000, 'unixepoch', 'localtime') ORDER BY createtime DESC")
fun getNewPackagesByDay(date: Long): List<Code>
- @Query("SELECT * FROM code WHERE date(createtime/1000, 'unixepoch', 'localtime') = date(:date/1000, 'unixepoch', 'localtime') ORDER BY createtime DESC")
+ @Query("""
+ SELECT * FROM code
+ WHERE substr(createtime, 1, 10) =
+ date(:date/1000, 'unixepoch', 'localtime')
+ ORDER BY createtime DESC
+ """)
fun getPackagesByDay(date: Long): Flow<List<Code>>
@Query("""
SELECT * FROM code
- WHERE strftime('%Y-%W', createtime/1000, 'unixepoch', 'localtime') =
- strftime('%Y-%W', :date/1000, 'unixepoch', 'localtime')
+ WHERE strftime('%Y-%W', substr(createtime, 1, 10)) =
+ strftime('%Y-%W', datetime(:date/1000, 'unixepoch', 'localtime'))
ORDER BY createtime DESC
""")
fun getPackagesByWeek(date: Long): Flow<List<Code>>
@Query("""
- SELECT * FROM CourierStat
- WHERE EXISTS (
- SELECT 1 FROM code p
- WHERE p.category = CourierStat.category
- AND strftime('%Y-%W', p.createtime/1000, 'unixepoch', 'localtime') =
- strftime('%Y-%W', :date/1000, 'unixepoch', 'localtime')
- )
+ SELECT category as courierName, COUNT(*) as count
+ FROM code
+ WHERE strftime('%Y-%W', substr(createtime, 1, 10)) =
+ strftime('%Y-%W', datetime(:date/1000, 'unixepoch', 'localtime'))
+ GROUP BY category
""")
fun getCourierStatsByWeek(date: Long): Flow<List<CourierStat>>
@Query("""
- SELECT * FROM DailyStat
- WHERE EXISTS (
- SELECT 1 FROM code p
- WHERE date(p.createtime/1000, 'unixepoch', 'localtime') = DailyStat.date
- AND strftime('%Y-%W', p.createtime/1000, 'unixepoch', 'localtime') =
- strftime('%Y-%W', :date/1000, 'unixepoch', 'localtime')
- )
+ SELECT substr(createtime, 1, 10) as date,
+ COUNT(*) as count
+ FROM code
+ WHERE strftime('%Y-%W', substr(createtime, 1, 10)) =
+ strftime('%Y-%W', datetime(:date/1000, 'unixepoch', 'localtime'))
+ GROUP BY substr(createtime, 1, 10)
""")
fun getDailyStatsByWeek(date: Long): Flow<List<DailyStat>>
}
--
Gitblit v1.9.3