From 9c7551a7a752c07db11b0fd23bfba8da1ad062e0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 21 六月 2024 20:39:12 +0800
Subject: [PATCH] fix 404
---
service/input_history_search.go | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/service/input_history_search.go b/service/input_history_search.go
index e81a10d..c2d96bb 100644
--- a/service/input_history_search.go
+++ b/service/input_history_search.go
@@ -97,11 +97,16 @@
func SearchHistoryReport(keyword string, operationType constvar.BaseOperationType, page, pageSize int) (recordIds []int, total uint64, err error) {
var ids []string
from := (page - 1) * pageSize
- t, err := parseDateString(keyword)
- if err != nil && t.IsZero() {
- ids, total, err = blevex.ComplexSearch(HistoryReportIndexName, keyword, map[string]interface{}{"baseOperationType": operationType}, from, pageSize)
+ t, err := time.ParseInLocation("20060102", keyword, time.Local)
+ //t, err := parseDateString(keyword)
+ m := make(map[string]interface{})
+ if operationType > 0 {
+ m["baseOperationType"] = operationType
+ }
+ if err != nil || t.IsZero() {
+ ids, total, err = blevex.ComplexSearch(HistoryReportIndexName, keyword, m, from, pageSize)
} else {
- ids, total, err = blevex.TimeSearch(HistoryReportIndexName, t, map[string]interface{}{"baseOperationType": operationType}, from, pageSize)
+ ids, total, err = blevex.TimeSearch(HistoryReportIndexName, t, m, from, pageSize)
}
if err != nil {
--
Gitblit v1.8.0