From be953da6ecba5036e63eac2bb5851e04dca1e8f7 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 14:06:56 +0800
Subject: [PATCH] fix
---
model/collectionProjection.go | 29 +++++++++++++++++++++++++----
service/collectionProjection.go | 4 ++--
api/v1/collectionProjection.go | 2 +-
model/contact.go | 3 +++
model/request/collectionProjection.go | 1 +
5 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/api/v1/collectionProjection.go b/api/v1/collectionProjection.go
index 49fb8a1..2caa97b 100644
--- a/api/v1/collectionProjection.go
+++ b/api/v1/collectionProjection.go
@@ -125,7 +125,7 @@
return
}
- total, errCode, list := collectionProjectionService.GetCollectionProjectionList(params.Page, params.PageSize)
+ total, errCode, list := collectionProjectionService.GetCollectionProjectionList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
diff --git a/model/collectionProjection.go b/model/collectionProjection.go
index 2e160a2..de10709 100644
--- a/model/collectionProjection.go
+++ b/model/collectionProjection.go
@@ -19,10 +19,11 @@
CollectionProjectionSearch struct {
CollectionProjection
- Orm *gorm.DB
- OrderBy string
- PageNum int
- PageSize int
+ Orm *gorm.DB
+ SearchMap map[string]interface{}
+ OrderBy string
+ PageNum int
+ PageSize int
}
)
@@ -40,6 +41,21 @@
var db = slf.Orm.Model(&CollectionProjection{})
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+
+ if len(slf.SearchMap) > 0 {
+ for key, value := range slf.SearchMap {
+ switch v := value.(type) {
+ case string:
+ if key == "estimated_collection_date" {
+ db = db.Where(key+" = ?", v)
+ }
+ case int:
+ if key == "client_id" {
+ db = db.Where(key+" = ?", v)
+ }
+ }
+ }
}
return db
@@ -92,3 +108,8 @@
slf.PageNum, slf.PageSize = page, size
return slf
}
+
+func (slf *CollectionProjectionSearch) SetSearchMap(data map[string]interface{}) *CollectionProjectionSearch {
+ slf.SearchMap = data
+ return slf
+}
diff --git a/model/contact.go b/model/contact.go
index 612fcba..560db43 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -93,6 +93,9 @@
}
}
case int:
+ if key == "client_id" {
+ db = db.Where("client_id = ?", v)
+ }
}
}
}
diff --git a/model/request/collectionProjection.go b/model/request/collectionProjection.go
index f60a1b1..579f593 100644
--- a/model/request/collectionProjection.go
+++ b/model/request/collectionProjection.go
@@ -17,4 +17,5 @@
type GetCollectionProjectionList struct {
PageInfo
+ SearchMap map[string]interface{}
}
diff --git a/service/collectionProjection.go b/service/collectionProjection.go
index 7da5f09..e482aa4 100644
--- a/service/collectionProjection.go
+++ b/service/collectionProjection.go
@@ -34,9 +34,9 @@
return ecode.OK
}
-func (CollectionProjectionService) GetCollectionProjectionList(page, pageSize int) (int64, int, []*model.CollectionProjection) {
+func (CollectionProjectionService) GetCollectionProjectionList(page, pageSize int, data map[string]interface{}) (int64, int, []*model.CollectionProjection) {
- total, err, list := model.NewCollectionProjectionSearch().SetPage(page, pageSize).Find()
+ total, err, list := model.NewCollectionProjectionSearch().SetPage(page, pageSize).SetSearchMap(data).Find()
if err != nil {
return total, ecode.CollectionProjectionListErr, list
}
--
Gitblit v1.8.0