From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
model/plan.go | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/model/plan.go b/model/plan.go
index acfe041..8386692 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:"-"`
@@ -26,12 +25,12 @@
PlanSearch struct {
Plan
- Orm *gorm.DB
- Keyword string
- OrderBy string
- PageNum int
- PageSize int
-
+ Orm *gorm.DB
+ Keyword string
+ OrderBy string
+ PageNum int
+ PageSize int
+ MemberIds []int
}
)
@@ -52,6 +51,9 @@
}
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+ if len(slf.MemberIds) != 0 {
+ db = db.Where("member_id in ?", slf.MemberIds)
}
return db
@@ -79,11 +81,19 @@
return record, err
}
-func (slf *PlanSearch) FindAll() ([]*Plan, error) {
+func (slf *PlanSearch) FindAll() ([]*Plan, int64, error) {
var db = slf.build()
- var record = make([]*Plan, 0)
- err := db.Find(&record).Error
- return record, err
+ var records = make([]*Plan, 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.Order("id desc").Find(&records).Error
+ return records, total, err
}
func (slf *PlanSearch) SetId(id int) *PlanSearch {
@@ -91,6 +101,11 @@
return slf
}
+func (slf *PlanSearch) SetMemberIds(ids []int) *PlanSearch {
+ slf.MemberIds = ids
+ return slf
+}
+
func (slf *PlanSearch) SetKeyword(keyword string) *PlanSearch {
slf.Keyword = keyword
return slf
--
Gitblit v1.8.0