From 5421f9d925a15eddfcaf356839ee1a180b36689a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 14:01:35 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
service/serviceCollectionPlan.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service/serviceCollectionPlan.go b/service/serviceCollectionPlan.go
index fdaa235..c1f1af7 100644
--- a/service/serviceCollectionPlan.go
+++ b/service/serviceCollectionPlan.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/model/request"
"aps_crm/pkg/ecode"
@@ -17,9 +18,9 @@
if len(serviceCollectionPlan) == 0 {
return ecode.ParamsErr
}
- contractId := serviceCollectionPlan[0].ServiceContractId
+ sourceId := serviceCollectionPlan[0].SourceId
err := model.WithTransaction(func(db *gorm.DB) error {
- err := model.NewServiceCollectionPlanSearch().SetOrm(db).SetServiceContractId(contractId).Delete()
+ err := model.NewServiceCollectionPlanSearch().SetOrm(db).SetSourceId(sourceId).Delete()
if err != nil {
return err
}
@@ -45,8 +46,8 @@
return ecode.OK
}
-func (ServiceCollectionPlanService) GetServiceCollectionPlanList(contractId int) ([]*model.ServiceCollectionPlan, int64, int) {
- list, total, err := model.NewServiceCollectionPlanSearch().SetServiceContractId(contractId).Find()
+func (ServiceCollectionPlanService) GetServiceCollectionPlanList(sourceType constvar.CollectionSourceType, sourceId int) ([]*model.ServiceCollectionPlan, int64, int) {
+ list, total, err := model.NewServiceCollectionPlanSearch().SetSourceType(sourceType).SetSourceId(sourceId).Find()
if err != nil {
return nil, 0, ecode.DBErr
}
--
Gitblit v1.8.0