From e4b79aa2e8effee7aeb2c1c516329f2bbc83e364 Mon Sep 17 00:00:00 2001 From: lanyulei Date: Wed, 17 Nov 2021 00:07:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=A1=A8=E5=8D=95=E5=86=85=E5=AE=B9=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/workOrderList.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/service/workOrderList.go b/pkg/service/workOrderList.go index 6791ee5..b8b0904 100644 --- a/pkg/service/workOrderList.go +++ b/pkg/service/workOrderList.go @@ -57,9 +57,8 @@ func (w *WorkOrder) PureWorkOrderList() (result interface{}, err error) { processParam := w.GinObj.DefaultQuery("process", "") formData := w.GinObj.DefaultQuery("formData", "") db := orm.Eloquent.Model(&process.WorkOrderInfo{}). - Joins("left join p_work_order_tpl_data on p_work_order_tpl_data.work_order = p_work_order_info.id"). - Where("p_work_order_info.title like ?", fmt.Sprintf("%%%v%%", title)). - Group("p_work_order_info.id") + Where("p_work_order_info.title like ?", fmt.Sprintf("%%%v%%", title)) + if startTime != "" { db = db.Where("p_work_order_info.create_time >= ?", startTime) } @@ -76,7 +75,9 @@ func (w *WorkOrder) PureWorkOrderList() (result interface{}, err error) { db = db.Where("p_work_order_info.process = ?", processParam) } if formData != "" { - db = db.Where("p_work_order_tpl_data.form_data->'$.*' LIKE CONCAT('%',?,'%')", formData) + db = db.Joins("left join p_work_order_tpl_data on p_work_order_tpl_data.work_order = p_work_order_info.id"). + Where("p_work_order_tpl_data.form_data->'$.*' LIKE CONCAT('%',?,'%')", formData). + Group("p_work_order_info.id") } if processor != "" && w.Classify != 1 { err = orm.Eloquent.Model(&processorInfo).