Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
c65c7d10
Commit
c65c7d10
authored
Jul 27, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活码列表修改
parent
e9f765c5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
HmQrcodeController.java
...c/haoban/manage/web/controller/hm/HmQrcodeController.java
+8
-7
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java
View file @
c65c7d10
...
@@ -38,8 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -38,8 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.stream.Collectors
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 活码(TabHaobanHmQrcode)表控制层
* 活码(TabHaobanHmQrcode)表控制层
...
@@ -210,11 +211,11 @@ public class HmQrcodeController {
...
@@ -210,11 +211,11 @@ public class HmQrcodeController {
if
(
hmGroupDTO
!=
null
)
{
if
(
hmGroupDTO
!=
null
)
{
hmQrcodeListDTO
.
setHmGroupName
(
hmGroupDTO
.
getGroupName
());
hmQrcodeListDTO
.
setHmGroupName
(
hmGroupDTO
.
getGroupName
());
}
}
if
(
CollectionUtils
.
isNotEmpty
(
storeDTOList
))
{
//
if (CollectionUtils.isNotEmpty(storeDTOList)) {
//门店id去重
//
//门店id去重
storeDTOList
=
storeDTOList
.
stream
()
//
storeDTOList = storeDTOList.stream()
.
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toCollection
(()
->
new
TreeSet
<>(
Comparator
.
comparing
(
HmStoreDTO:
:
getStoreId
))),
ArrayList:
:
new
));
//
.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HmStoreDTO::getStoreId))), ArrayList::new));
}
//
}
hmQrcodeListDTO
.
setClerkList
(
clerkDTOList
);
hmQrcodeListDTO
.
setClerkList
(
clerkDTOList
);
hmQrcodeListDTO
.
setStoreList
(
storeDTOList
);
hmQrcodeListDTO
.
setStoreList
(
storeDTOList
);
}
}
...
...
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