From b0d1fe4e0acb0fa40c684069c0e9d77d7a65ace3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 15:53:53 +0800
Subject: [PATCH] fix
---
model/plan.go | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/model/plan.go b/model/plan.go
index 5a71fef..0ba2f15 100644
--- a/model/plan.go
+++ b/model/plan.go
@@ -3,7 +3,6 @@
import (
"aps_crm/pkg/mysqlx"
"gorm.io/gorm"
- "time"
)
type (
@@ -16,8 +15,8 @@
SubOrder SubOrder `json:"subOrder" gorm:"foreignKey:SubOrderId"`
SalesDetailsId int `json:"salesDetailsId" gorm:"column:sales_details_id;type:int;comment:閿�鍞槑缁唅d"`
SalesDetails SalesDetails `json:"salesDetails" gorm:"foreignKey:SalesDetailsId"`
- StartTime time.Time `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
- EndTime time.Time `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
+ StartTime *CustomTime `json:"startTime" gorm:"column:start_time;type:datetime;comment:寮�濮嬫椂闂�"`
+ EndTime *CustomTime `json:"endTime" gorm:"column:end_time;type:datetime;comment:缁撴潫鏃堕棿"`
Content string `json:"content" gorm:"column:content;type:varchar(255);comment:璁″垝鍐呭"`
File string `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
gorm.Model `json:"-"`
@@ -81,15 +80,15 @@
func (slf *PlanSearch) FindAll() ([]*Plan, int64, error) {
var db = slf.build()
var records = make([]*Plan, 0)
- if slf.PageNum > 0 && slf.PageSize > 0 {
- db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
- }
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.Find(&records).Error
+ err := db.Order("id desc").Find(&records).Error
return records, total, err
}
@@ -111,4 +110,4 @@
func (slf *PlanSearch) SetOrder(order string) *PlanSearch {
slf.OrderBy = order
return slf
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0