From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 c3b0d52..455c801 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
@@ -54,7 +54,7 @@
SELECT * FROM Code
WHERE oneLevel LIKE '%' || :keyword || '%'
AND pickup = '0'
- ORDER BY time DESC
+ ORDER BY createTime DESC
""")
fun getByKeyword(keyword: String): List<Code>
@@ -202,7 +202,7 @@
CAST(strftime('%W', dates.date) AS INTEGER) as weekOfYear,
COUNT(code.id) as count
FROM dates
- LEFT JOIN code ON date(code.createTime) = dates.date
+ LEFT JOIN code ON date(code.createTime) = dates.date and code.category='快递'
GROUP BY dates.date
ORDER BY dates.date
""")
@@ -237,12 +237,12 @@
)
SELECT
strftime('%m', month_start) as date,
- COUNT(code.id) as count,
+ COUNT(c.id) as count,
strftime('%Y-%m-%d', month_start) as weekStart
- FROM months
- LEFT JOIN code ON strftime('%Y-%m', code.createTime) = strftime('%Y-%m', months.month_start)
- GROUP BY months.month_start
- ORDER BY months.month_start ASC
+ FROM months m
+ LEFT JOIN code c ON strftime('%Y-%m', c.createTime) = strftime('%Y-%m', m.month_start) and c.category='快递'
+ GROUP BY m.month_start
+ ORDER BY m.month_start ASC
""")
fun getYearMonthlyStats(date: Long): Flow<List<DailyStat>>
@@ -335,7 +335,7 @@
COUNT(c.id) AS count,
'' AS weekStart
FROM dates d
- LEFT JOIN code c ON date(c.createTime) = d.date_value
+ LEFT JOIN code c ON date(c.createTime) = d.date_value and c.category='快递'
GROUP BY d.date_value
ORDER BY d.date_value ASC
""")
--
Gitblit v1.9.3