Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 6d41ca8e
authored
Jun 11, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[add]
1.项目列表支持的项目名称支持忽略大小写的模糊查询 2.工单列表支持多个指派人查询
1 parent
a79955b8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletions
src/main/java/vion/dto/TaskDTO.java
src/main/java/vion/model/Store.java
src/main/java/vion/service/impl/TaskServiceImpl.java
src/main/java/vion/dto/TaskDTO.java
View file @
6d41ca8
...
...
@@ -68,6 +68,7 @@ public class TaskDTO extends BaseDTO {
* 当前处理人
*/
private
Long
activeUser
;
private
Long
[]
activeUsers
;
/**
* 截止日期
*/
...
...
src/main/java/vion/model/Store.java
View file @
6d41ca8
...
...
@@ -25,7 +25,7 @@ public class Store {
/**
* 门店名称
*/
@TableField
(
condition
=
SqlCondition
.
LIKE
)
@TableField
(
condition
=
"%s ILIKE CONCAT('%%',#{%s},'%%')"
)
private
String
name
;
/**
* 销售人
...
...
src/main/java/vion/service/impl/TaskServiceImpl.java
View file @
6d41ca8
...
...
@@ -75,6 +75,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
.
leftJoin
(
Store
.
class
,
Store:
:
getId
,
Task:
:
getStoreId
)
.
leftJoin
(
Account
.
class
,
Account:
:
getId
,
Task:
:
getAccountId
)
.
leftJoin
(
ServiceOrder
.
class
,
ServiceOrder:
:
getTaskId
,
Task:
:
getId
)
.
in
(
ArrayUtil
.
isNotEmpty
(
data
.
getActiveUsers
()),
Task:
:
getActiveUser
,
data
.
getActiveUsers
())
.
between
(
ArrayUtil
.
isAllNotNull
(
data
.
getStartdate
(),
data
.
getEnddate
()),
Task:
:
getRepairTime
,
data
.
getStartdate
(),
data
.
getEnddate
())
.
isNotNull
(
ObjUtil
.
equals
(
data
.
getSource
(),
1
),
Task:
:
getTaskTempId
)
.
isNull
(
ObjUtil
.
equals
(
data
.
getSource
(),
2
),
Task:
:
getTaskTempId
)
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment