From 85e0c18115b6d6facf4f45e5217ace8d9c585c00 Mon Sep 17 00:00:00 2001
From: Raymond Yang <ray650128@gmail.com>
Date: Mon, 26 Jun 2023 21:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=9B=A2=E9=96=8B=E6=88=90?=
 =?UTF-8?q?=E5=93=A1=E7=AF=A9=E9=81=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcredive/plugins/MemberRecordRouting.kt   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/com/ray650128/pcredive/plugins/MemberRecordRouting.kt b/src/main/kotlin/com/ray650128/pcredive/plugins/MemberRecordRouting.kt
index 27a1da6..95416f4 100644
--- a/src/main/kotlin/com/ray650128/pcredive/plugins/MemberRecordRouting.kt
+++ b/src/main/kotlin/com/ray650128/pcredive/plugins/MemberRecordRouting.kt
@@ -32,6 +32,8 @@ fun Application.configureMemberRecordRouting() {
                 }
                 post("/{id}") {
                     val id = call.parameters.getOrFail<String>("id")
+                    val now = Calendar.getInstance()
+
                     val record = call.receive<MemberRecord>()
                     val member = MemberService.findById(id) ?: run {
                         call.respond(HttpStatusCode.NotFound)
@@ -86,26 +88,37 @@ fun Application.configureMemberRecordRouting() {
     }
 }
 
-fun getData(year: Int, month: Int, day: Int): List<RecordData> {
+fun getDayStartLong(year: Int, month: Int, day: Int): Long {
     val calendar = Calendar.getInstance().apply {
         set(Calendar.YEAR, year)
         set(Calendar.MONTH, month)
         set(Calendar.DAY_OF_MONTH, day)
     }
-    val startTime = calendar.apply {
+    return calendar.apply {
         set(Calendar.HOUR_OF_DAY, 5)
         set(Calendar.MINUTE, 0)
         set(Calendar.SECOND, 0)
         set(Calendar.MILLISECOND, 0)
     }.timeInMillis
-    val endTime = startTime + 86399000L
+}
+
+fun getDayEndLong(year: Int, month: Int, day: Int): Long {
+    val startTime = getDayStartLong(year, month, day)
+    return startTime + 86399000L
+}
+
+fun getData(year: Int, month: Int, day: Int): List<RecordData> {
+    val startTime = getDayStartLong(year, month, day)
+    val endTime = getDayEndLong(year, month, day)
     // Show a list of articles
     val records = ArrayList<RecordData>()
     val memberList = MemberService.findAll()
     memberList.forEach { member ->
-        records.add(
-            RecordData(member = member, MemberRecord())
-        )
+        if (member.createAt!! < startTime && !member.leave) {
+            records.add(
+                RecordData(member = member, MemberRecord())
+            )
+        }
     }
     val recordList = MemberRecordService.findByTimeBetween(startTime, endTime)
     recordList.forEach { record ->