From 81cda4f09d4c0fff6edd087d1c49d05cb6eaab38 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 20:47:27 +0800
Subject: [PATCH] 当前使用的工艺编号置顶
---
service/task.go | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/service/task.go b/service/task.go
index f9413cc..a9b75ca 100644
--- a/service/task.go
+++ b/service/task.go
@@ -131,14 +131,19 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
- if status == model.ProcedureStatusFinished {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error {
+ if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
ProgressCacheUnset(channel)
}
- return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
- "status": status,
- "channel": channel,
- })
+
+ upMap := map[string]interface{}{"status": status}
+ if status == model.ProcedureStatusProcessing {
+ upMap["process_model_number"] = processModelNumber
+ } else if status == model.ProcedureStatusWaitProcess {
+ upMap["process_model_number"] = ""
+ }
+
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
--
Gitblit v1.8.0