From eb65f4c3c6903b11424eeaefe46653acedf24448 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 09:40:22 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceContract.go | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index ed0fd26..45907c8 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
)
@@ -13,19 +14,6 @@
return ecode.SContractExist
}
- return ecode.OK
-}
-
-func (SContractService) DeleteServiceContract(id int) int {
- _, err := model.NewServiceContractSearch().SetId(id).Find()
- if err != nil {
- return ecode.SContractNotExist
- }
-
- err = model.NewServiceContractSearch().SetId(id).Delete()
- if err != nil {
- return ecode.SContractNotExist
- }
return ecode.OK
}
@@ -44,20 +32,33 @@
return ecode.OK
}
-func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
- list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
- if err != nil {
- return nil, ecode.SContractListErr
- }
+//func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
+// list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
+// if err != nil {
+// return nil, ecode.SContractListErr
+// }
+//
+// return list, ecode.OK
+//}
- return list, ecode.OK
+func (SContractService) DeleteServiceContract(ids []int) int {
+ // delete client
+ err := model.NewServiceContractSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.SContractDeleteErr
+ }
+ return ecode.OK
}
-func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int) {
+func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) {
// get contact list
- contacts, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewServiceContractSearch().
+ SetKeyword(keyword).
+ SetKeywordType(keywordType).
+ SetQueryClass(queryClass).
+ SetPage(page, pageSize).FindAll()
if err != nil {
- return nil, ecode.SContractListErr
+ return nil, 0, ecode.SContractListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0