From 28c5cf41c5064579dd62f79fd40dc5990e9565b2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 09 九月 2024 20:52:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
data/prepare.go | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/data/prepare.go b/data/prepare.go
index 6fec710..86d24cc 100644
--- a/data/prepare.go
+++ b/data/prepare.go
@@ -200,7 +200,7 @@
}
// processData 鍑芥暟澶勭悊鏁版嵁锛屾牴鎹姹傝繃婊ゆ帀鏁版嵁骞舵牴鎹鍒欐洿鏂扮姸鎬�
-func ProcessData(captureInfos []db.CaptureInfo, personStatus []*db.PersonStatus, ruleInfos []db.PersonnelStatusRule, communityID string) []db.PersonStatus {
+func ProcessData(captureInfos []db.CaptureInfo, personStatus []*db.PersonStatus, ruleInfos []db.PersonnelStatusRule, statusNo map[string]int, communityID string) []db.PersonStatus {
filteredInfos := make([]db.PersonStatus, 0)
// 鏋勫缓蹇�熸煡鎵剧储寮曪紝鏂逛究鏌ユ壘瀵瑰簲鐨勪汉鍛樼姸鎬佸拰瑙勫垯
@@ -230,6 +230,9 @@
//}
// 鏇存柊杩囨护鍚庣殑淇℃伅鍒楄〃
//fmt.Println("LastAppearanceTime: ", person.LastAppearanceTime)
+ if statusNo[person.Status] > statusNo[info.Status] {
+ continue
+ }
filteredInfos = append(filteredInfos, db.PersonStatus{CommunityID: communityID, DocumentNumber: info.DocumentNumber, Status: info.Status, FrequentAddress: info.FrequentAddress, LastAppearanceStatusTime: person.LastAppearanceTime})
}
--
Gitblit v1.8.0