From 49f56cee1e2285fd32c43f35e3622d2ed6c5fec3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 26 八月 2023 20:09:07 +0800
Subject: [PATCH] plc tag
---
service/task.go | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/service/task.go b/service/task.go
index e173964..5b7be1c 100644
--- a/service/task.go
+++ b/service/task.go
@@ -47,23 +47,14 @@
if err != nil {
return nil, ecode.DBErr
}
- return slf.GetTask() //褰撳墠璁㈠崟宸插畬鍏紝缁х画鏌ヨ鏈畬鎴愯鍗�
+ return slf.GetTask() //褰撳墠璁㈠崟宸插畬鎴愶紝缁х画鏌ヨ鏈畬鎴愯鍗�
}
if err != nil {
return nil, ecode.DBErr
}
- nextProcedure := new(model.Procedures)
- nextProcedure, err = model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStatus(model.ProcedureStatusUnFinished).
- SetId(procedure.ID + 1).First()
- if err == nil {
- nextProcedure.ProceduresInfo.ProcedureName = "--"
- }
taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
- taskData.NextProcedure = nextProcedure
return taskData, ecode.OK
}
@@ -84,3 +75,12 @@
func (slf TaskService) GetOrderByWorkOrderId(workOrderId string) (order *model.Order, err error) {
return model.NewOrderSearch(nil).SetWorkOrderId(workOrderId).First()
}
+
+// GetComingTask 鑾峰彇鏃堕棿鏈埌鐨勬渶鏃╀换鍔�
+func (slf TaskService) GetComingTask() (workOrder *model.Order, err error) {
+ nowTs := time.Now().Unix()
+ orderSearch := model.NewOrderSearch(nil)
+ return orderSearch.SetOrder("created_at asc").
+ SetStartTimeMin(nowTs).
+ SetStatus(model.OrderStatusUnFinished).First()
+}
--
Gitblit v1.8.0