From 16e06252079d36be7686a3d006c8b73565973c68 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:08 +0800
Subject: [PATCH] 全文搜索支持时间查询
---
controllers/operation.go | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index aafdf87..e75abc4 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -177,17 +177,18 @@
// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
// @Produce application/json
//
-// @Param number path string true "鍗曞彿"
+// @Param id path string true "id"
//
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/operation/getOperationInfo/{number} [post]
+// @Router /api-wms/v1/operation/getOperationInfo/{id} [get]
func (slf OperationController) GetOperationInfo(c *gin.Context) {
- number := c.Param("number")
+ number := c.Param("id")
if number == "" {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屽弬鏁颁笉鑳戒负绌�")
return
}
- operation, err := models.NewOperationSearch().SetNumber(number).SetPreload(true).First()
+ id, _ := strconv.Atoi(number)
+ operation, err := models.NewOperationSearch().SetID(id).SetPreload(true).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -732,6 +733,7 @@
func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
var histories []*models.MoveHistory
+ operationMap := make(map[int]*models.Operation, len(operationList))
for _, operation := range operationList {
for _, v := range operation.Details {
history := &models.MoveHistory{
@@ -752,12 +754,13 @@
}
histories = append(histories, history)
}
+ operationMap[operation.Id] = operation
}
if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
return err
}
for _, history := range histories {
- service.AddNewHistoryReportRecord(history.Id)
+ service.AddNewHistoryReportRecord(history, operationMap[history.OperationId])
}
return nil
}
--
Gitblit v1.8.0