From f1842bf9b5bb69b5078a215c02cb16b7e33f893a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 08 一月 2024 14:38:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 model/contract.go |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/model/contract.go b/model/contract.go
index e437c6c..92bd5e7 100644
--- a/model/contract.go
+++ b/model/contract.go
@@ -28,7 +28,7 @@
 
 	ContractSearch struct {
 		Contract
-
+		Keyword   string
 		Orm       *gorm.DB
 		SearchMap map[string]interface{}
 		OrderBy   string
@@ -47,6 +47,11 @@
 	}
 }
 
+func (slf *ContractSearch) SetKeyword(keyword string) *ContractSearch {
+	slf.Keyword = keyword
+	return slf
+}
+
 func (slf *ContractSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&Contract{})
 
@@ -55,6 +60,10 @@
 	}
 	if slf.Number != "" {
 		db = db.Where("number = ?", slf.Number)
+	}
+
+	if slf.Keyword != "" {
+		db = db.Joins("Client").Where("contract_name like ? or contract.number like ? or Client.name like ?", fmt.Sprintf("%%%v%%", slf.Keyword), fmt.Sprintf("%%%v%%", slf.Keyword), fmt.Sprintf("%%%v%%", slf.Keyword))
 	}
 
 	if len(slf.SearchMap) > 0 {
@@ -76,6 +85,10 @@
 				if key == "created_at" {
 					db = db.Where(key+"= ?", v)
 				}
+
+				if key == "contract_name" {
+					db = db.Where("contract_name=?", "%"+v+"%")
+				}
 			case int:
 				if key == "member_id" {
 					db = db.Where(key+"= ?", v)

--
Gitblit v1.8.0