From 91487fbd678ed772c5aa5b4e250f6f6e9616f219 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:54:18 +0800
Subject: [PATCH] fixt
---
service/task.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service/task.go b/service/task.go
index adb83c1..a4e6931 100644
--- a/service/task.go
+++ b/service/task.go
@@ -8,6 +8,7 @@
"apsClient/model/response"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/pkg/timex"
"fmt"
"github.com/jinzhu/gorm"
"time"
@@ -172,6 +173,9 @@
logx.Errorf("TaskStart GetProcessModel err:%v", err)
return nil, err
}
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
if err == nil {
return data, nil
}
@@ -222,12 +226,12 @@
search := model.NewProceduresSearch(nil).
SetDeviceId(deviceID).
SetOffset(offset, limit).SetChannels(channels)
- nowTs := time.Now().Unix()
+ todayStartTs := timex.TodayStartTs()
switch queryType {
case request.QueryTypeUnFinish:
search.SetStatusNot(model.ProcedureStatusFinished).SetOrder("status desc, start_time asc")
case request.QueryTypeToday:
- search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(nowTs).SetEndTimeMax(nowTs + 86400).SetOrder("status desc, start_time asc")
+ search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(todayStartTs).SetEndTimeMax(todayStartTs + 86400).SetOrder("status desc, start_time asc")
case request.QueryTypeFinished:
search.SetStatus(model.ProcedureStatusFinished).SetOrder("start_time desc")
}
--
Gitblit v1.8.0