Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 5706bb32
authored
Jul 10, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
技术员日历、技术员甘特图剥离到独立的service实现中
1 parent
e718deb7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
View file @
5706bb3
...
...
@@ -242,7 +242,7 @@ public class EngineerServiceImpl implements EngineerService {
LambdaQueryWrapper
<
EngineerInfo
>
lqw
=
new
LambdaQueryWrapper
<>();
lqw
.
in
(
groupIds
!=
null
&&
!
groupIds
.
isEmpty
(),
EngineerInfo:
:
getGroupId
,
groupIds
);
if
(
StringUtils
.
isNotEmpty
(
kind
))
{
if
(
StringUtils
.
isNotEmpty
(
kind
))
{
lqw
.
eq
(
EngineerInfo:
:
getKind
,
(
kind
.
equals
(
"fullJob"
))
?
1
:
2
);
}
if
(
StringUtils
.
isNotEmpty
(
key
))
{
...
...
@@ -290,7 +290,7 @@ public class EngineerServiceImpl implements EngineerService {
lqw
.
in
(
EngineerSkillGroup:
:
getEngineerCode
,
engineerCodes
);
lqw
.
in
(
EngineerSkillGroup:
:
getStatus
,
statuses
);
List
<
EngineerSkillGroup
>
records
=
engineerSkillGroupMPDao
.
selectList
(
lqw
);
if
(
records
==
null
||
records
.
isEmpty
())
{
if
(
records
==
null
||
records
.
isEmpty
())
{
return
map
;
}
...
...
@@ -554,10 +554,4 @@ public class EngineerServiceImpl implements EngineerService {
tips
.
add
(
new
LabelValueDTO
().
setLabel
(
"标签"
).
setValue
(
order
.
getTags
()));
return
tips
;
}
private
String
Timestamp2Datetime
(
Timestamp
t
,
String
pattern
)
{
DateTimeFormatter
df
=
DateTimeFormatter
.
ofPattern
(
pattern
);
return
df
.
format
(
t
.
toLocalDateTime
());
}
}
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