From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
models/operation.go | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index ccf54fd..ff81c5b 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -4,6 +4,7 @@
"fmt"
"github.com/shopspring/decimal"
"gorm.io/gorm"
+ "time"
"wms/constvar"
"wms/pkg/mysqlx"
)
@@ -25,7 +26,7 @@
OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
- CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID-瀹㈡埛"`
+ CompanyID string `json:"companyID" gorm:"type:varchar(255);comment:鍏徃ID-瀹㈡埛"`
CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
Comment string `json:"comment" gorm:"type:text;comment:澶囨敞"`
LogisticCompanyId string `json:"logisticCompanyId" gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
@@ -70,6 +71,9 @@
Ids []int
SourceNumbers []string
SalesDetailsNumbers []string
+ Fields string
+ BeginTime time.Time
+ EndTime time.Time
}
)
@@ -103,6 +107,11 @@
func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
slf.Keyword = keyword
+ return slf
+}
+
+func (slf *OperationSearch) SetFields(fields string) *OperationSearch {
+ slf.Fields = fields
return slf
}
@@ -163,6 +172,12 @@
func (slf *OperationSearch) SetOperationSource(operationSource constvar.OperationSource) *OperationSearch {
slf.OperationSource = operationSource
+ return slf
+}
+
+func (slf *OperationSearch) SetTimeBetween(beginTime, endTime time.Time) *OperationSearch {
+ slf.BeginTime = beginTime
+ slf.EndTime = endTime
return slf
}
@@ -228,6 +243,13 @@
db = db.Where("operation_source = ?", slf.OperationSource)
}
+ if slf.Fields != "" {
+ db = db.Select(slf.Fields)
+ }
+
+ if !slf.BeginTime.IsZero() && !slf.EndTime.IsZero() {
+ db = db.Where("created_at between ? and ?", slf.BeginTime, slf.EndTime)
+ }
return db
}
@@ -351,6 +373,18 @@
return records, nil
}
+func (slf *OperationSearch) FindIds() ([]int, error) {
+ var (
+ records = make([]int, 0)
+ db = slf.build()
+ )
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
func (slf *OperationSearch) FindByQuery(query string, args []interface{}) ([]*Operation, int64, error) {
var (
--
Gitblit v1.8.0