From 70ac39123c8c6bc7e7ae0436ee57e62166cf190c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 20 十二月 2024 02:59:08 +0800
Subject: [PATCH] 修复bug
---
models/disappear.go | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/models/disappear.go b/models/disappear.go
index 8ad5215..08ceda2 100644
--- a/models/disappear.go
+++ b/models/disappear.go
@@ -101,10 +101,10 @@
s.community_id,
s.org_id,
p.person_name,
- p.id_card ,
+ p.id_card,
s.last_appearance_time,
s.last_direction,
- s.last_location
+ s.last_location
FROM
snapshot_count_summary AS s
JOIN person AS p ON p.id = s.document_number
@@ -114,11 +114,13 @@
AND TIMESTAMPDIFF(
YEAR,
STR_TO_DATE( CASE WHEN LENGTH( id_card ) = 18 THEN SUBSTRING( id_card, 7, 8 ) ELSE NULL END, '%Y%m%d' ),
- CURDATE( ) >= ?
- AND TIMESTAMPDIFF(
+ CURDATE( )
+ ) >= ?
+ AND TIMESTAMPDIFF(
YEAR,
STR_TO_DATE( CASE WHEN LENGTH( id_card ) = 18 THEN SUBSTRING( id_card, 7, 8 ) ELSE NULL END, '%Y%m%d' ),
- CURDATE( ) <= ?
+ CURDATE( )
+ ) <= ?
`, m.MinAge, m.MaxAge).Scan(&ageFilter).Error
if err != nil {
logger.Warnf(err.Error())
@@ -196,12 +198,12 @@
}
logger.Debugf("match key person result %d", len(keyFilter))
- }
- if len(lastFilter) > 0 {
- lastFilter = intersectPersonInfo(lastFilter, keyFilter)
- } else {
- lastFilter = keyFilter
+ if len(lastFilter) > 0 {
+ lastFilter = intersectPersonInfo(lastFilter, keyFilter)
+ } else {
+ lastFilter = keyFilter
+ }
}
logger.Debugf("last result %d", len(lastFilter))
--
Gitblit v1.8.0