Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
4050a5b1
Commit
4050a5b1
authored
Jan 29, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加窗口编码
parent
396c6c59
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
...hx/module/window/service/impl/WindowOwnerServiceImpl.java
+1
-4
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
View file @
4050a5b1
...
@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
...
@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
ownerList
.
addAll
(
subTwoList
);
ownerList
.
addAll
(
subTwoList
);
if
(!
ObjectUtils
.
isEmpty
(
pdu
.
getHallId
()))
{
if
(!
ObjectUtils
.
isEmpty
(
pdu
.
getHallId
()))
{
ownerList
=
ownerList
.
stream
().
sorted
(
Comparator
.
comparing
(
WindowPdu:
:
getSelected
)).
filter
(
f
->
pdu
.
getHallId
().
equals
(
f
.
getHallId
())).
collect
(
Collectors
.
toList
());
ownerList
=
ownerList
.
stream
().
sorted
(
Comparator
.
comparing
(
WindowPdu:
:
getSelected
)
.
reversed
()
).
filter
(
f
->
pdu
.
getHallId
().
equals
(
f
.
getHallId
())).
collect
(
Collectors
.
toList
());
}
}
...
@@ -209,10 +209,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
...
@@ -209,10 +209,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
@Override
@Override
public
Rest
<
List
<
String
>>
getPerformMonthList
(
Context
context
)
{
public
Rest
<
List
<
String
>>
getPerformMonthList
(
Context
context
)
{
Set
<
String
>
collectSet
=
new
HashSet
<>();
Set
<
String
>
collectSet
=
new
HashSet
<>();
//查询所有窗口汇总表
//查询所有窗口汇总表
WindowPerformQuery
windowPerformQuery
=
new
WindowPerformQuery
();
WindowPerformQuery
windowPerformQuery
=
new
WindowPerformQuery
();
windowPerformQuery
.
setOwnerId
(
context
.
getUser
().
getCustomerId
());
windowPerformQuery
.
setOwnerId
(
context
.
getUser
().
getCustomerId
());
...
...
Write
Preview
Markdown
is supported
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