From 844f645172ebde7e94307004647e4a41f71030be Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 17 十一月 2023 18:57:37 +0800
Subject: [PATCH] 引入bleve全文搜索引擎，创建位置报表索引，支持位置报表全文搜索
---
controllers/report_forms_controller.go | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index ca58506..40488da 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -10,6 +10,7 @@
"wms/models"
"wms/request"
"wms/response"
+ "wms/service"
)
type ReportFormsController struct {
@@ -245,11 +246,19 @@
ids = append(ids, location.Id)
}
}
-
- amounts, total, err := models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
- return
+ var (
+ amounts []*models.LocationProductAmount
+ total int64
+ err error
+ )
+ if params.KeyWord != "" {
+ amounts, total, err = service.SearchLocationReport(params.KeyWord, params.Page, params.PageSize)
+ } else {
+ amounts, total, err = models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
+ return
+ }
}
var result []response.LocationForms
--
Gitblit v1.8.0