From 804979f04aff0e0dbc0c5261411fdea7cfa031d8 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 10 二月 2025 11:14:38 +0800
Subject: [PATCH] 测试 场景分析 bug
---
service/task_results.go | 11 +++++++++++
models/locationAnalysis.go | 4 ++--
db/task_results.go | 13 +++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/db/task_results.go b/db/task_results.go
index 17de425..b3d912f 100644
--- a/db/task_results.go
+++ b/db/task_results.go
@@ -36,6 +36,7 @@
PageSize int
Order string
Keyword string
+ location string
}
func NewModelTaskResultsSearch() *ModelTaskResultsSearch {
@@ -86,6 +87,11 @@
return slf
}
+func (slf *ModelTaskResultsSearch) SetFirstLocation(location string) *ModelTaskResultsSearch {
+ slf.location = location
+ return slf
+}
+
func (slf *ModelTaskResultsSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
if slf.Order != "" {
@@ -112,6 +118,13 @@
kw := "%" + slf.Keyword + "%"
db = db.Where("name like ?", kw)
}
+ if slf.Keyword != "" {
+ kw := "%" + slf.Keyword + "%"
+ db = db.Where("name like ?", kw)
+ }
+ if slf.location != "" {
+ db = db.Where("location = ?", slf.location)
+ }
return db
}
diff --git a/models/locationAnalysis.go b/models/locationAnalysis.go
index 4b61092..715ea78 100644
--- a/models/locationAnalysis.go
+++ b/models/locationAnalysis.go
@@ -219,7 +219,7 @@
//logger.Debugf("task %s last result %d", m.Task.Name, len(lastFilter))
document_number_list = []string{}
for _, i := range keyFilter {
- logger.Debugf("keyFilter %s ------------- %s", i.Id, i.PersonType)
+ //logger.Debugf("keyFilter %s ------------- %s", i.Id, i.PersonType)
document_number_list = append(document_number_list, i.Id)
person := document_number_map[i.Id]
person.PersonType = i.PersonType
@@ -267,7 +267,7 @@
results = append(results, result)
}
logger.Debugf("task %s last filter result %d", m.Task.Name, len(results))
- return service.SaveTaskResults(results)
+ return service.SaveLocationTaskResults(results)
}
func (m *LocationModel) KeepAlive() error {
diff --git a/service/task_results.go b/service/task_results.go
index 2c72759..4854651 100644
--- a/service/task_results.go
+++ b/service/task_results.go
@@ -15,3 +15,14 @@
}
return nil
}
+
+func SaveLocationTaskResults(results []*db.ModelTaskResults) error {
+ for _, v := range results {
+ err := db.NewModelTaskResultsSearch().SetTaskId(v.ModelTaskID).SetPicDate(v.PicDate).SetFirstLocation(v.Location).FirstOrCreate(v)
+ if err != nil {
+ logger.Errorf("save task result err:%v", err)
+ return err
+ }
+ }
+ return nil
+}
--
Gitblit v1.8.0