feat: 工单筛选支持表单内容搜索。
feat: 工单筛选支持表单内容搜索。
This commit is contained in:
commit
fb3889b63c
@ -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).
|
||||||
|
Loading…
x
Reference in New Issue
Block a user