From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix
---
service/serviceFollowup.go | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/service/serviceFollowup.go b/service/serviceFollowup.go
index 2dd1099..46c52c9 100644
--- a/service/serviceFollowup.go
+++ b/service/serviceFollowup.go
@@ -17,19 +17,6 @@
return ecode.OK
}
-func (FollowupService) DeleteServiceFollowup(id int) int {
- _, err := model.NewServiceFollowupSearch().SetId(id).Find()
- if err != nil {
- return ecode.ServiceFollowupNotExist
- }
-
- err = model.NewServiceFollowupSearch().SetId(id).Delete()
- if err != nil {
- return ecode.ServiceFollowupNotExist
- }
- return ecode.OK
-}
-
func (FollowupService) UpdateServiceFollowup(serviceFollowup *model.ServiceFollowup) int {
// check serviceFollowup exist
_, err := model.NewServiceFollowupSearch().SetId(serviceFollowup.Id).Find()
@@ -45,12 +32,24 @@
return ecode.OK
}
-func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string) ([]*model.ServiceFollowup, int64, int) {
+func (FollowupService) DeleteServiceFollowup(ids []int) int {
+ // delete client
+ err := model.NewServiceFollowupSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.ServiceFollowupDeleteErr
+ }
+ return ecode.OK
+}
+
+func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string, serviceOrderId int) ([]*model.ServiceFollowup, int64, int) {
// get contact list
contacts, total, err := model.NewServiceFollowupSearch().
SetKeywordType(keywordType).
SetKeyword(keyword).
- SetPage(page, pageSize).FindAll()
+ SetPage(page, pageSize).
+ SetPreload(true).
+ SetServiceOrderId(serviceOrderId).
+ FindAll()
if err != nil {
return nil, 0, ecode.ServiceFollowupListErr
}
--
Gitblit v1.8.0