From a250ca176b468e87d32892c0055fe1faace6a79b Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 10:29:25 +0800
Subject: [PATCH] fix

---
 model/salesReturn.go      |    2 
 model/plan.go             |    2 
 model/salesLeads.go       |    2 
 model/contract.go         |    2 
 model/quotation.go        |    2 
 model/contact.go          |    2 
 model/masterOrder.go      |    2 
 model/followRecord.go     |    4 
 model/orderManage.go      |  232 +++++++++++++++++++++++-----------------------
 model/serviceFollowup.go  |    2 
 model/serviceContract.go  |    2 
 model/salesDetails.go     |    2 
 model/serviceFeeManage.go |    2 
 model/salesRefund.go      |    2 
 model/subOrder.go         |    2 
 15 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/model/contact.go b/model/contact.go
index a955791..d1b838f 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -152,7 +152,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
+	err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/contract.go b/model/contract.go
index 505871d..04c87a3 100644
--- a/model/contract.go
+++ b/model/contract.go
@@ -110,7 +110,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Quotation").Find(&records).Error
+	err := db.Preload("Quotation").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/followRecord.go b/model/followRecord.go
index b12a6da..c7671f6 100644
--- a/model/followRecord.go
+++ b/model/followRecord.go
@@ -123,7 +123,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Client").Preload("Contact").Find(&records).Error
+	err := db.Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
@@ -140,7 +140,7 @@
 	if err != nil {
 		return records, count, err
 	}
-	err = slf.build().Offset((page - 1) * pageSize).Limit(pageSize).Find(&records).Error
+	err = slf.build().Offset((page - 1) * pageSize).Limit(pageSize).Order("id desc").Find(&records).Error
 	return records, count, err
 }
 
diff --git a/model/masterOrder.go b/model/masterOrder.go
index 6231b0b..377a7b3 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -111,7 +111,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Client").Find(&records).Error
+	err := db.Preload("Client").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/orderManage.go b/model/orderManage.go
index 228118c..5037667 100644
--- a/model/orderManage.go
+++ b/model/orderManage.go
@@ -1,116 +1,116 @@
-package model
-
-import (
-	"aps_crm/pkg/mysqlx"
-	"gorm.io/gorm"
-)
-
-type (
-	OrderManage struct {
-		Id                 int    `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		Name               string `json:"name" gorm:"column:name;type:varchar(255);comment:鍚堝悓鍚嶇О"`
-		ClientId           int    `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
-		Client             Client `json:"client" gorm:"foreignKey:ClientId"`
-		Number             string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
-		ContactId          int    `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
-		OrderType          int    `json:"orderType" gorm:"column:order_type;type:int;comment:宸ュ崟绫诲瀷"`
-		ReportSourceId     int    `json:"reportSourceId" gorm:"column:report_source_id;type:int;comment:鎶ュ鏉ユ簮id"`
-		SourceSheet        int    `json:"sourceSheet" gorm:"column:source_sheet;type:int;comment:鏉ユ簮鍗曟嵁"`
-		ProblemDescription string `json:"problemDescription" gorm:"column:problem_description;type:text;comment:闂鎻忚堪"`
-		File               string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
-		gorm.Model         `json:"-"`
-	}
-
-	OrderManageSearch struct {
-		OrderManage
-
-		Orm      *gorm.DB
-		Keyword  string
-		OrderBy  string
-		PageNum  int
-		PageSize int
-	}
-)
-
-func (OrderManage) TableName() string {
-	return "order_manage"
-}
-
-func NewOrderManageSearch() *OrderManageSearch {
-	return &OrderManageSearch{
-		Orm: mysqlx.GetDB(),
-	}
-}
-
-func (slf *OrderManageSearch) build() *gorm.DB {
-	var db = slf.Orm.Model(&OrderManage{})
-	if slf.Keyword != "" {
-		db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
-	}
-	if slf.Id != 0 {
-		db = db.Where("id = ?", slf.Id)
-	}
-
-	return db
-}
-
-func (slf *OrderManageSearch) Create(record *OrderManage) error {
-	var db = slf.build()
-	return db.Create(record).Error
-}
-
-func (slf *OrderManageSearch) Update(record *OrderManage) error {
-	var db = slf.build()
-	return db.Updates(record).Error
-}
-
-func (slf *OrderManageSearch) Delete() error {
-	var db = slf.build()
-	return db.Delete(&OrderManage{}).Error
-}
-
-func (slf *OrderManageSearch) Find() (*OrderManage, error) {
-	var db = slf.build()
-	var record = new(OrderManage)
-	err := db.First(record).Error
-	return record, err
-}
-
-func (slf *OrderManageSearch) FindAll() ([]*OrderManage, int64, error) {
-	var db = slf.build()
-	var records = make([]*OrderManage, 0)
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		return records, total, err
-	}
-	if slf.PageNum > 0 && slf.PageSize > 0 {
-		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
-	}
-
-	err := db.Preload("Client").Find(&records).Error
-	return records, total, err
-}
-
-func (slf *OrderManageSearch) SetId(id int) *OrderManageSearch {
-	slf.Id = id
-	return slf
-}
-
-func (slf *OrderManageSearch) SetKeyword(keyword string) *OrderManageSearch {
-	slf.Keyword = keyword
-	return slf
-}
-
-func (slf *OrderManageSearch) SetPage(page, size int) *OrderManageSearch {
-	slf.PageNum, slf.PageSize = page, size
-	return slf
-}
-
-func (slf *OrderManageSearch) SetOrder(order string) *OrderManageSearch {
-	slf.OrderBy = order
-	return slf
-}
-func (slf *OrderManageSearch) SetIds(ids []int) *OrderManageSearch {
-	slf.Orm = slf.Orm.Where("id in (?)", ids)
-	return slf
-}
+package model
+
+import (
+	"aps_crm/pkg/mysqlx"
+	"gorm.io/gorm"
+)
+
+type (
+	OrderManage struct {
+		Id                 int    `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+		Name               string `json:"name" gorm:"column:name;type:varchar(255);comment:鍚堝悓鍚嶇О"`
+		ClientId           int    `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+		Client             Client `json:"client" gorm:"foreignKey:ClientId"`
+		Number             string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"`
+		ContactId          int    `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"`
+		OrderType          int    `json:"orderType" gorm:"column:order_type;type:int;comment:宸ュ崟绫诲瀷"`
+		ReportSourceId     int    `json:"reportSourceId" gorm:"column:report_source_id;type:int;comment:鎶ュ鏉ユ簮id"`
+		SourceSheet        int    `json:"sourceSheet" gorm:"column:source_sheet;type:int;comment:鏉ユ簮鍗曟嵁"`
+		ProblemDescription string `json:"problemDescription" gorm:"column:problem_description;type:text;comment:闂鎻忚堪"`
+		File               string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
+		gorm.Model         `json:"-"`
+	}
+
+	OrderManageSearch struct {
+		OrderManage
+
+		Orm      *gorm.DB
+		Keyword  string
+		OrderBy  string
+		PageNum  int
+		PageSize int
+	}
+)
+
+func (OrderManage) TableName() string {
+	return "order_manage"
+}
+
+func NewOrderManageSearch() *OrderManageSearch {
+	return &OrderManageSearch{
+		Orm: mysqlx.GetDB(),
+	}
+}
+
+func (slf *OrderManageSearch) build() *gorm.DB {
+	var db = slf.Orm.Model(&OrderManage{})
+	if slf.Keyword != "" {
+		db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
+	}
+	if slf.Id != 0 {
+		db = db.Where("id = ?", slf.Id)
+	}
+
+	return db
+}
+
+func (slf *OrderManageSearch) Create(record *OrderManage) error {
+	var db = slf.build()
+	return db.Create(record).Error
+}
+
+func (slf *OrderManageSearch) Update(record *OrderManage) error {
+	var db = slf.build()
+	return db.Updates(record).Error
+}
+
+func (slf *OrderManageSearch) Delete() error {
+	var db = slf.build()
+	return db.Delete(&OrderManage{}).Error
+}
+
+func (slf *OrderManageSearch) Find() (*OrderManage, error) {
+	var db = slf.build()
+	var record = new(OrderManage)
+	err := db.First(record).Error
+	return record, err
+}
+
+func (slf *OrderManageSearch) FindAll() ([]*OrderManage, int64, error) {
+	var db = slf.build()
+	var records = make([]*OrderManage, 0)
+	var total int64
+	if err := db.Count(&total).Error; err != nil {
+		return records, total, err
+	}
+	if slf.PageNum > 0 && slf.PageSize > 0 {
+		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+	}
+
+	err := db.Preload("Client").Order("id desc").Find(&records).Error
+	return records, total, err
+}
+
+func (slf *OrderManageSearch) SetId(id int) *OrderManageSearch {
+	slf.Id = id
+	return slf
+}
+
+func (slf *OrderManageSearch) SetKeyword(keyword string) *OrderManageSearch {
+	slf.Keyword = keyword
+	return slf
+}
+
+func (slf *OrderManageSearch) SetPage(page, size int) *OrderManageSearch {
+	slf.PageNum, slf.PageSize = page, size
+	return slf
+}
+
+func (slf *OrderManageSearch) SetOrder(order string) *OrderManageSearch {
+	slf.OrderBy = order
+	return slf
+}
+func (slf *OrderManageSearch) SetIds(ids []int) *OrderManageSearch {
+	slf.Orm = slf.Orm.Where("id in (?)", ids)
+	return slf
+}
diff --git a/model/plan.go b/model/plan.go
index 6441c30..0ba2f15 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -88,7 +88,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Find(&records).Error
+	err := db.Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/quotation.go b/model/quotation.go
index 77a4e5c..4f2b1b5 100644
--- a/model/quotation.go
+++ b/model/quotation.go
@@ -117,7 +117,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Client").Preload("Contact").Find(&records).Error
+	err := db.Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/salesDetails.go b/model/salesDetails.go
index be63cf7..831b44c 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -136,7 +136,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Find(&records).Error
+	err := db.Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/salesLeads.go b/model/salesLeads.go
index 03ff127..e33349b 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -133,7 +133,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Province").Preload("City").Preload("FollowRecord").Find(&records).Error
+	err := db.Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/salesRefund.go b/model/salesRefund.go
index 0d942a0..75a3ad3 100644
--- a/model/salesRefund.go
+++ b/model/salesRefund.go
@@ -129,7 +129,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Products").Find(&records).Error
+	err := db.Preload("Products").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/salesReturn.go b/model/salesReturn.go
index d4a64a7..5e730e7 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -92,7 +92,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Products").Find(&records).Error
+	err := db.Preload("Products").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/serviceContract.go b/model/serviceContract.go
index 05eed61..526b545 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -150,7 +150,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Find(&records).Error
+	err := db.Order("id desc").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/serviceFeeManage.go b/model/serviceFeeManage.go
index 39f7e9a..45f4705 100644
--- a/model/serviceFeeManage.go
+++ b/model/serviceFeeManage.go
@@ -157,7 +157,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Client").Find(&records).Error
+	err := db.Preload("Client").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index 4a175e3..a5fb79d 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -133,7 +133,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Find(&records).Error
+	err := db.Order("id desc").Find(&records).Error
 	return records, total, err
 }
 
diff --git a/model/subOrder.go b/model/subOrder.go
index e702457..8ba75c8 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -107,7 +107,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("Products").Preload("Client").Find(&records).Error
+	err := db.Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 

--
Gitblit v1.8.0