From d7d7bd7e6635c18b26ddc8c3d9794600a719583b Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 27 七月 2023 14:09:59 +0800
Subject: [PATCH] tmp
---
model/salesReturn.go | 11 ++---
model/plan.go | 11 ++---
model/salesLeads.go | 9 ++--
model/saleChance.go | 9 ++--
model/subOrder.go | 12 +++---
model/orderManage.go | 11 ++---
6 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/model/orderManage.go b/model/orderManage.go
index 34b9477..24e051c 100644
--- a/model/orderManage.go
+++ b/model/orderManage.go
@@ -24,12 +24,11 @@
OrderManageSearch struct {
OrderManage
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -79,9 +78,9 @@
func (slf *OrderManageSearch) FindAll() ([]*OrderManage, error) {
var db = slf.build()
- var record = make([]*OrderManage, 0)
- err := db.Preload("Client").Find(&record).Error
- return record, err
+ var records = make([]*OrderManage, 0)
+ err := db.Preload("Client").Find(&records).Error
+ return records, err
}
func (slf *OrderManageSearch) SetId(id int) *OrderManageSearch {
@@ -102,4 +101,4 @@
func (slf *OrderManageSearch) SetOrder(order string) *OrderManageSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
diff --git a/model/plan.go b/model/plan.go
index e3aee66..a25a368 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -26,12 +26,11 @@
PlanSearch struct {
Plan
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -81,9 +80,9 @@
func (slf *PlanSearch) FindAll() ([]*Plan, error) {
var db = slf.build()
- var record = make([]*Plan, 0)
- err := db.Find(&record).Error
- return record, err
+ var records = make([]*Plan, 0)
+ err := db.Find(&records).Error
+ return records, err
}
func (slf *PlanSearch) SetId(id int) *PlanSearch {
@@ -104,4 +103,4 @@
func (slf *PlanSearch) SetOrder(order string) *PlanSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
diff --git a/model/saleChance.go b/model/saleChance.go
index 38222ba..36647a3 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -103,10 +103,11 @@
return
}
-func (slf *SaleChanceSearch) FindAll() (record []*SaleChance, err error) {
+func (slf *SaleChanceSearch) FindAll() ([]*SaleChance, error) {
var db = slf.build()
- err = db.Preload("Client").Preload("Contact").Find(&record).Error
- return
+ var records []*SaleChance
+ err := db.Preload("Client").Preload("Contact").Find(&records).Error
+ return records, err
}
func (slf *SaleChanceSearch) SetId(id int) *SaleChanceSearch {
@@ -132,4 +133,4 @@
func (slf *SaleChanceSearch) SetOrder(order string) *SaleChanceSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
diff --git a/model/salesLeads.go b/model/salesLeads.go
index 75647b6..a7f69f4 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -113,10 +113,11 @@
return
}
-func (slf *SalesLeadsSearch) FindAll() (result []*SalesLeads, err error) {
+func (slf *SalesLeadsSearch) FindAll() ([]*SalesLeads, error) {
var db = slf.build()
- err = db.Preload("FollowRecord").Find(&result).Error
- return
+ var results []*SalesLeads
+ err := db.Preload("FollowRecord").Find(&results).Error
+ return results, err
}
func (slf *SalesLeadsSearch) SetId(id int) *SalesLeadsSearch {
@@ -148,4 +149,4 @@
func (slf *SalesLeadsSearch) SetOrder(order string) *SalesLeadsSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
diff --git a/model/salesReturn.go b/model/salesReturn.go
index bb07ce5..96cc96c 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -22,12 +22,11 @@
SalesReturnSearch struct {
SalesReturn
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -77,9 +76,9 @@
func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, error) {
var db = slf.build()
- var record = make([]*SalesReturn, 0)
- err := db.Preload("Products").Find(&record).Error
- return record, err
+ var records = make([]*SalesReturn, 0)
+ err := db.Preload("Products").Find(&records).Error
+ return records, err
}
func (slf *SalesReturnSearch) SetId(id int) *SalesReturnSearch {
@@ -100,4 +99,4 @@
func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
diff --git a/model/subOrder.go b/model/subOrder.go
index 2163d75..b99097b 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -20,12 +20,11 @@
SubOrderSearch struct {
SubOrder
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -72,10 +71,11 @@
return
}
-func (slf *SubOrderSearch) FindAll() (result []*SubOrder, err error) {
+func (slf *SubOrderSearch) FindAll() ([]*SubOrder, error) {
var db = slf.build()
- err = db.Preload("Products").Preload("Client").Find(&result).Error
- return
+ var results []*SubOrder
+ err := db.Preload("Products").Preload("Client").Find(&results).Error
+ return results, err
}
func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {
@@ -96,4 +96,4 @@
func (slf *SubOrderSearch) SetOrder(order string) *SubOrderSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0