From 08e7f0e4148808ce435b213f09dc8b80eebb6613 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 26 十月 2023 11:00:24 +0800
Subject: [PATCH] fix
---
service/task.go | 9 ---------
api/v1/task.go | 2 +-
2 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 8cdb4e5..36ab772 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -215,7 +215,7 @@
}
err := model.WithTransaction(func(db *gorm.DB) error {
- err := service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusFinished, procedure.Channel)
+ err := service.NewTaskService().UpdateProcedureStatusAndChannel(db, id, model.ProcedureStatusFinished, procedure.Channel, procedure.ProcessModelNumber)
if err != nil {
return err
}
diff --git a/service/task.go b/service/task.go
index 35a368e..ed8b6ea 100644
--- a/service/task.go
+++ b/service/task.go
@@ -152,15 +152,6 @@
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
- if status == model.ProcedureStatusFinished {
- ProgressCacheUnset(channel)
- }
- return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
- "status": status,
- })
-}
-
func (slf TaskService) UpdateOrderStatus(db *gorm.DB, id uint, status model.OrderStatus) error {
return model.NewOrderSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
--
Gitblit v1.8.0