fix

zhangqian

2023-11-09 cacf363f222e354cad6db18c4a00fb1097d35c2c

 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"
@@ -222,12 +223,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")
   }