From b7d67bb4a5536e6d7330f843f4209edf0399261d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 18:01:18 +0800
Subject: [PATCH] 本次报工开始时间为上次报工结束时间
---
service/task.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service/task.go b/service/task.go
index bebd3ff..323add1 100644
--- a/service/task.go
+++ b/service/task.go
@@ -1,6 +1,7 @@
package service
import (
+ "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
"apsClient/model/common"
@@ -133,7 +134,7 @@
func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32, processModelNumber string) error {
if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
- ProgressCacheUnset(channel)
+ ProgressCacheUnset(conf.Conf.CurrentDeviceID, channel)
}
upMap := map[string]interface{}{"status": status}
@@ -173,6 +174,9 @@
logx.Errorf("TaskStart GetProcessModel err:%v", err)
return nil, err
}
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
if err == nil {
return data, nil
}
@@ -195,7 +199,7 @@
// GetTaskStatusSync 鑾峰彇寰呭悓姝ヤ换鍔′俊鎭�
func (slf TaskService) GetTaskStatusSync(limit int) ([]*model.TaskStatusSync, error) {
- return model.NewTaskStatusSyncSearch(nil).SetOrder("id desc").SetPage(1, limit).FindNotTotal()
+ return model.NewTaskStatusSyncSearch(nil).SetOrder("id asc").SetPage(1, limit).FindNotTotal()
}
// RemoveTaskStatusSync 鍒犻櫎鍚屾瀹岀殑璁板綍
--
Gitblit v1.8.0