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 d8a327ca
authored
Nov 16, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pref(工程师日历): 就近申明变量
1 parent
3fd18d2b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
View file @
d8a327c
...
...
@@ -97,7 +97,6 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
@Override
public
Result
<?>
getEngineersCalendar
(
EngineerCalendarDTO
.
Request
req
)
{
// 技术员日历,查询 capacity_engineer_calendar表,如果当日有各种事项,进行显示;否则显示正常上班;
List
<
EngineerCalendarDTO
.
Engineer
>
engineers
=
new
ArrayList
<>();
List
<
String
>
allCodes
=
engineerUtil
.
getEngineersByLevel
(
req
.
getLevelType
(),
req
.
getLevelValue
()).
stream
()
.
map
(
EngineerInfoEntity:
:
getEngineerCode
).
collect
(
Collectors
.
toList
());
...
...
@@ -105,6 +104,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
Page
<
EngineerInfoEntity
>
page
=
engineerUtil
.
filterEngineersByKeyAndPage
(
allCodes
,
req
.
getKey
(),
req
.
getPage
(),
req
.
getSize
());
String
edate
=
DateUtils
.
localDateFromStr
(
req
.
getDate
()).
plusDays
(
14
).
toString
();
List
<
EngineerCalendarDTO
.
Engineer
>
engineers
=
new
ArrayList
<>();
for
(
EngineerInfoEntity
e
:
page
.
getContent
())
{
EngineerCalendarDTO
.
Engineer
engineer
=
new
EngineerCalendarDTO
.
Engineer
();
engineer
.
setEngineerCode
(
e
.
getEngineerCode
());
...
...
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