From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts
---
service/input_history_search.go | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/service/input_history_search.go b/service/input_history_search.go
index 319d763..45803c5 100644
--- a/service/input_history_search.go
+++ b/service/input_history_search.go
@@ -12,14 +12,19 @@
)
type HistoryReport struct {
- ID int
- BaseOperationType constvar.BaseOperationType
- Number string //鎿嶄綔鍗曞彿
- ProductId string //浜у搧缂栧彿
- ProductName string //浜у搧鍚嶇О
- OperationTypeName string //涓氬姟鍚嶇О
- FromLocation string //婧愪綅缃悕绉�
- ToLocation string //鐩爣浣嶇疆鍚嶇О
+ ID int `json:"ID,omitempty"`
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType,omitempty"`
+ Number string `json:"number,omitempty"` //鎿嶄綔鍗曞彿
+ ProductId string `json:"productId,omitempty"` //浜у搧缂栧彿
+ ProductName string `json:"productName,omitempty"` //浜у搧鍚嶇О
+ OperationTypeName string `json:"operationTypeName,omitempty"` //涓氬姟鍚嶇О
+ FromLocation string `json:"fromLocation,omitempty"` //婧愪綅缃悕绉�
+ ToLocation string `json:"toLocation,omitempty"` //鐩爣浣嶇疆鍚嶇О
+ Date string `json:"date,omitempty"` //鏃ユ湡
+ Company string `json:"company,omitempty"` // 渚涘簲鍟�/瀹㈡埛
+ Carrier string `json:"carrier,omitempty"` //鎵胯繍鍟嗗悕绉�
+ WaybillNumber string `json:"waybillNumber"` //杩愬崟鍙�
+ ReceiverName string `json:"receiverName"` //鏀惰揣浜�
}
const (
@@ -36,19 +41,24 @@
return
}
records := make([]*models.MoveHistory, 0, 100)
- reports := make([]*HistoryReport, 0, 100)
err = models.NewMoveHistorySearch().Orm.FindInBatches(&records, 100, func(tx *gorm.DB, batch int) error {
- err = structx.AssignTo(records, &reports)
+ operationIds := make([]int, 0, len(records))
+ for _, record := range records {
+ operationIds = append(operationIds, record.OperationId)
+ }
+
+ operations, err := models.NewOperationSearch().SetPreload(true).SetIds(operationIds).FindNotTotal()
if err != nil {
- logx.Errorf("AddNewHistoryReportRecord AssignTo err:%v", err)
return err
}
- for _, report := range reports {
- err = blevex.Add(HistoryReportIndexName, strconv.Itoa(report.ID), report)
- if err != nil {
- logx.Errorf("InitHistoryReportData add failed, err:%v, index:%v, data:%v", err, HistoryReportIndexName, report)
- return err
- }
+ operationMap := make(map[int]*models.Operation, len(operations))
+
+ for _, operation := range operations {
+ operationMap[operation.Id] = operation
+ }
+
+ for _, record := range records {
+ AddNewHistoryReportRecord(record, operationMap[record.OperationId])
}
return nil
}).Error
@@ -62,7 +72,7 @@
func SearchHistoryReport(keyword string, operationType constvar.BaseOperationType, page, pageSize int) (recordIds []int, total uint64, err error) {
var ids []string
from := (page - 1) * pageSize
- ids, total, err = blevex.ComplexSearch(HistoryReportIndexName, keyword, map[string]interface{}{"BaseOperationType": operationType}, from, pageSize)
+ ids, total, err = blevex.ComplexSearch(HistoryReportIndexName, keyword, map[string]interface{}{"baseOperationType": operationType}, from, pageSize)
if err != nil {
return
}
@@ -76,19 +86,21 @@
return
}
-func AddNewHistoryReportRecord(moveHistoryId int) {
+func AddNewHistoryReportRecord(record *models.MoveHistory, operation *models.Operation) {
var report HistoryReport
- record, err := models.NewMoveHistorySearch().SetID(uint(moveHistoryId)).First()
- if err != nil {
- logx.Errorf("AddNewHistoryReportRecord Find err:%v", err)
- return
- }
- err = structx.AssignTo(record, &report)
+ err := structx.AssignTo(record, &report)
if err != nil {
logx.Errorf("AddNewHistoryReportRecord AssignTo err:%v", err)
return
}
- err = blevex.Add(HistoryReportIndexName, strconv.Itoa(moveHistoryId), report)
+
+ report.Date = record.UpdatedAt.Format("2006-01-02")
+ report.Carrier = operation.LogisticCompany.Name
+ report.Company = operation.CompanyName
+ report.WaybillNumber = operation.WaybillNumber
+ report.ReceiverName = operation.ReceiverName
+
+ err = blevex.Add(HistoryReportIndexName, strconv.Itoa(record.Id), report)
if err != nil {
logx.Errorf("AddNewHistoryReportRecord bleve add err:%v", err)
return
--
Gitblit v1.8.0