From c6173b62e0fea3116075d56692b73cc0bc624815 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 27 八月 2023 00:54:56 +0800
Subject: [PATCH] 逻辑修改
---
service/task.go | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/service/task.go b/service/task.go
index 5b7be1c..ac5fdca 100644
--- a/service/task.go
+++ b/service/task.go
@@ -19,9 +19,9 @@
func (slf TaskService) GetTask() (taskData *response.TaskData, code int) {
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
- orderSearch.SetOrder("created_at asc").
- SetStartTimeMax(nowTs).
- SetStatus(model.OrderStatusUnFinished)
+ orderSearch.SetOrder("start_time asc").
+ SetStartTimeMin(nowTs).
+ SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing})
var (
err error
order *model.Order
@@ -34,10 +34,10 @@
if err != nil {
return nil, ecode.DBErr
}
- procedure, err := model.NewProceduresSearch(nil).
+ procedure, err := model.NewProceduresSearch(nil).SetOrder("start_time asc").
SetWorkOrderId(order.WorkOrderID).
SetStartTimeMax(nowTs).
- SetStatus(model.ProcedureStatusUnFinished).
+ SetStatusNot(model.ProcedureStatusFinished).
First()
if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
err = nil
@@ -66,8 +66,14 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatus(id int, status model.ProcedureStatus) error {
- return model.NewProceduresSearch(nil).SetId(id).UpdateByMap(map[string]interface{}{
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
+ "status": status,
+ })
+}
+
+func (slf TaskService) UpdateOrderStatus(db *gorm.DB, id uint, status model.OrderStatus) error {
+ return model.NewOrderSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
}
@@ -76,11 +82,11 @@
return model.NewOrderSearch(nil).SetWorkOrderId(workOrderId).First()
}
-// GetComingTask 鑾峰彇鏃堕棿鏈埌鐨勬渶鏃╀换鍔�
-func (slf TaskService) GetComingTask() (workOrder *model.Order, err error) {
+// GetCurrentTask 鑾峰彇寰呭畬鎴愭垨杩涜涓殑浠诲姟锛� 姣忎釜宸ュ崟鍙湁涓�涓伐搴�
+func (slf TaskService) GetCurrentTask() (workOrder *model.Order, err error) {
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
- return orderSearch.SetOrder("created_at asc").
+ return orderSearch.SetOrder("start_time asc").
SetStartTimeMin(nowTs).
- SetStatus(model.OrderStatusUnFinished).First()
+ SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing}).First()
}
--
Gitblit v1.8.0