XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 工单筛选支持表单内容搜索。

Browse Source 
feat: 工单筛选支持表单内容搜索。
This commit is contained in:
lanyulei 2021-11-17 00:07:41 +08:00 committed by GitHub
commit fb3889b63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/service/workOrderList.go
View File

@ -57,9 +57,8 @@ func (w *WorkOrder) PureWorkOrderList() (result interface{}, err error) {
processParam := w.GinObj.DefaultQuery("process", "") processParam := w.GinObj.DefaultQuery("process", "")
formData := w.GinObj.DefaultQuery("formData", "") formData := w.GinObj.DefaultQuery("formData", "")
db := orm.Eloquent.Model(&process.WorkOrderInfo{}). 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))
Where("p_work_order_info.title like ?", fmt.Sprintf("%%%v%%", title)).
Group("p_work_order_info.id")
if startTime != "" { if startTime != "" {
db = db.Where("p_work_order_info.create_time >= ?", 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) db = db.Where("p_work_order_info.process = ?", processParam)
} }
if formData != "" { 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 { if processor != "" && w.Classify != 1 {
err = orm.Eloquent.Model(&processorInfo). err = orm.Eloquent.Model(&processorInfo).