From e5650a0fd3d5db06b3a59ba364f4b177707f98cb Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 08 八月 2023 09:48:04 +0800 Subject: [PATCH] 更改端口和配置名字 --- service/serviceContract.go | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/service/serviceContract.go b/service/serviceContract.go index a24b5ad..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 } @@ -53,9 +41,22 @@ // return list, ecode.OK //} -func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int64, int) { +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, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) { // get contact list - contacts, total, 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, 0, ecode.SContractListErr } -- Gitblit v1.8.0