From 1406aea9315875710c526d9eba8e698183ad96e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:16:05 +0800
Subject: [PATCH] merge master
---
service/task.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/task.go b/service/task.go
index a9b75ca..4ff5cb8 100644
--- a/service/task.go
+++ b/service/task.go
@@ -11,7 +11,7 @@
"apsClient/pkg/logx"
"apsClient/pkg/structx"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
"time"
)
@@ -123,7 +123,7 @@
return NoRepeatedWorkers
}
-func (slf TaskService) GetProcedureById(id int) (*model.Procedures, int) {
+func (slf TaskService) GetProcedureById(id uint) (*model.Procedures, int) {
procedure, err := model.NewProceduresSearch(nil).SetId(id).First()
if err != nil {
return nil, ecode.DBErr
@@ -146,7 +146,7 @@
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
ProgressCacheUnset(channel)
}
--
Gitblit v1.8.0