From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 service/serviceContractStatus.go |   98 ++++++++++++++++++++++++++-----------------------
 1 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/service/serviceContractStatus.go b/service/serviceContractStatus.go
index 93cced0..ac5a82a 100644
--- a/service/serviceContractStatus.go
+++ b/service/serviceContractStatus.go
@@ -1,4 +1,3 @@
-
 package service
 
 import (
@@ -9,61 +8,68 @@
 
 type ServiceContractStatusService struct{}
 
+func NewServiceContractStatusService() ServiceContractStatusService {
+	return ServiceContractStatusService{}
+}
+
 func (ServiceContractStatusService) AddServiceContractStatus(serviceContractStatus *model.ServiceContractStatus) int {
 	err := model.NewServiceContractStatusSearch().Create(serviceContractStatus)
 	if err != nil {
-		return ecode.ServiceContractStatusExist
+		return ecode.DBErr
 	}
 
 	return ecode.OK
 }
 
-func (ServiceContractStatusService) DeleteServiceContractStatus(id int) int {
-	_, err := model.NewServiceContractStatusSearch().SetId(id).Find()
+func (ServiceContractStatusService) GetServiceContractStatus(id int) (*model.ServiceContractStatus, int) {
+	serviceContractStatus, err := model.NewServiceContractStatusSearch().SetId(id).First()
 	if err != nil {
-		return ecode.ServiceContractStatusNotExist
-	}
-
-	err = model.NewServiceContractStatusSearch().SetId(id).Delete()
-	if err != nil {
-		return ecode.ServiceContractStatusNotExist
-	}
-	return ecode.OK
-}
-
-func (ServiceContractStatusService) GetServiceContractStatusList() ([]*model.ServiceContractStatus, int) {
-	list, err := model.NewServiceContractStatusSearch().FindAll()
-	if err != nil {
-		return nil, ecode.ServiceContractStatusListErr
-	}
-
-	return list, ecode.OK
-}
-
-func (ServiceContractStatusService) UpdateServiceContractStatus(serviceContractStatuss []*request.UpdateServiceContractStatus) int {
-	for _, v := range serviceContractStatuss {
-		// check serviceContractStatus exist
-		_, err := model.NewServiceContractStatusSearch().SetId(v.Id).Find()
-		if err != nil {
-			return ecode.ServiceContractStatusNotExist
-		}
-
-		err = model.NewServiceContractStatusSearch().SetId(v.Id).Updates(map[string]interface{}{
-			"name": v.Name,
-		})
-		if err != nil {
-			return ecode.ServiceContractStatusSetErr
-		}
-	}
-
-	return ecode.OK
-}
-
-func (ServiceContractStatusService) GetServiceContractStatusDetail(id int) (*model.ServiceContractStatus, int) {
-	serviceContractStatus, err := model.NewServiceContractStatusSearch().SetId(id).Find()
-	if err != nil {
-		return nil, ecode.ServiceContractStatusNotExist
+		return nil, ecode.DBErr
 	}
 
 	return serviceContractStatus, ecode.OK
 }
+
+func (ServiceContractStatusService) DeleteServiceContractStatus(id int) int {
+	err := model.NewServiceContractStatusSearch().SetId(id).Delete()
+	if err != nil {
+		return ecode.DBErr
+	}
+	return ecode.OK
+}
+
+func (ServiceContractStatusService) GetServiceContractStatusList() ([]*model.ServiceContractStatus, int64, int) {
+	list, total, err := model.NewServiceContractStatusSearch().Find()
+	if err != nil {
+		return nil, 0, ecode.DBErr
+	}
+
+	return list, total, ecode.OK
+}
+
+func (ServiceContractStatusService) UpdateServiceContractStatuss(ServiceContractStatuss []*request.UpdateServiceContractStatus) int {
+	for _, v := range ServiceContractStatuss {
+		// check ServiceContractStatus exist
+		_, err := model.NewServiceContractStatusSearch().SetId(v.Id).First()
+		if err != nil {
+			return ecode.DBErr
+		}
+
+		err = model.NewServiceContractStatusSearch().SetId(v.Id).Updates(map[string]interface{}{
+
+		})
+		if err != nil {
+			return ecode.DBErr
+		}
+	}
+
+	return ecode.OK
+}
+
+func (ServiceContractStatusService) UpdateServiceContractStatus(serviceContractStatus *model.ServiceContractStatus) int {
+		err := model.NewServiceContractStatusSearch().SetId(serviceContractStatus.Id).Save(serviceContractStatus)
+		if err != nil {
+			return ecode.DBErr
+		}
+	return ecode.OK
+}

--
Gitblit v1.8.0