Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Ferry
Commits
e4b79aa2
Commit
e4b79aa2
authored
3 years ago
by
lanyulei
Browse files
Options
Download
Email Patches
Plain Diff
feat: 工单筛选支持表单内容搜索。
parent
0746a730
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/service/workOrderList.go
+5
-4
pkg/service/workOrderList.go
with
5 additions
and
4 deletions
+5
-4
pkg/service/workOrderList.go
+
5
-
4
View file @
e4b79aa2
...
...
@@ -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
)
.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment