From cdbda5e3895814b688bcc0e6b34b6067b0b9b773 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 20:17:08 +0800
Subject: [PATCH] fix
---
service/task.go | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/service/task.go b/service/task.go
index 64a72df..944d0e0 100644
--- a/service/task.go
+++ b/service/task.go
@@ -23,7 +23,7 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
+// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
func (slf TaskService) GetTask(page, pageSize int) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
@@ -37,9 +37,11 @@
)
procedures, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
SetStartTimeMax(nowTs).
+ SetEndTimeMin(nowTs).
SetDeviceId(conf.Conf.System.DeviceId).
SetStatusNot(model.ProcedureStatusFinished).
SetPage(page, pageSize).
+ SetOrder("status desc").
FindNotTotal()
if err != nil {
return nil, ecode.DBErr
@@ -145,9 +147,6 @@
func (slf TaskService) GetProcessParams(procedure *model.Procedures, order *model.Order) (processModel *model.ProcessModel, err error) {
data, err := model.NewProcessModelSearch().
- SetWorkOrder(procedure.WorkOrderID).
- SetDevice(procedure.ProceduresInfo.DeviceName).
- SetOrderId(procedure.OrderID).
SetProcedure(procedure.ProceduresInfo.ProcedureName).
SetProduct(order.ProductName).
SetOrder("id desc").First()
--
Gitblit v1.8.0