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
fdccfbcc
Commit
fdccfbcc
authored
Jul 14, 2022
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 统计活码分组sql修复
parent
16c3d05f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
HmQrcodeGroupNumBO.java
.../haoban/manage/service/pojo/bo/hm/HmQrcodeGroupNumBO.java
+3
-3
HmGroupApiServiceImpl.java
...ge/service/service/out/impl/hm/HmGroupApiServiceImpl.java
+2
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmQrcodeGroupNumBO.java
View file @
fdccfbcc
...
...
@@ -6,7 +6,7 @@ public class HmQrcodeGroupNumBO implements Serializable {
private
static
final
long
serialVersionUID
=
-
7006820026168431701L
;
private
Integer
num
;
private
Integer
hmGroupId
;
private
Long
hmGroupId
;
private
String
hmGroupName
;
public
Integer
getNum
()
{
...
...
@@ -17,11 +17,11 @@ public class HmQrcodeGroupNumBO implements Serializable {
this
.
num
=
num
;
}
public
Integer
getHmGroupId
()
{
public
Long
getHmGroupId
()
{
return
hmGroupId
;
}
public
void
setHmGroupId
(
Integer
hmGroupId
)
{
public
void
setHmGroupId
(
Long
hmGroupId
)
{
this
.
hmGroupId
=
hmGroupId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java
View file @
fdccfbcc
...
...
@@ -116,13 +116,13 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
result
.
addAll
(
groupDtoPage
.
getResult
());
List
<
Long
>
groupIds
=
result
.
stream
().
map
(
HmGroupDTO:
:
getGroupId
).
collect
(
Collectors
.
toList
());
List
<
HmQrcodeGroupNumBO
>
qrcodeGroupNumBoList
=
qrcodeService
.
getGroupIdNumByEnterpriseId
(
groupQueryDTO
.
getEnterpriseId
(),
groupIds
);
Map
<
Integer
,
Integer
>
qrcodeGroupNumMap
=
Collections
.
emptyMap
();
Map
<
Long
,
Integer
>
qrcodeGroupNumMap
=
Collections
.
emptyMap
();
if
(
CollectionUtils
.
isNotEmpty
(
qrcodeGroupNumBoList
))
{
qrcodeGroupNumMap
=
qrcodeGroupNumBoList
.
stream
()
.
collect
(
Collectors
.
toMap
(
HmQrcodeGroupNumBO:
:
getHmGroupId
,
HmQrcodeGroupNumBO:
:
getNum
,
(
v1
,
v2
)
->
v1
));
}
for
(
HmGroupDTO
groupDTO
:
result
)
{
Integer
referNum
=
Optional
.
ofNullable
(
qrcodeGroupNumMap
.
get
(
groupDTO
.
getGroupId
()
.
intValue
()
)).
orElse
(
0
);
Integer
referNum
=
Optional
.
ofNullable
(
qrcodeGroupNumMap
.
get
(
groupDTO
.
getGroupId
())).
orElse
(
0
);
groupDTO
.
setReferNum
(
referNum
);
if
(!
DEFAULT_GROUP_ID
.
equals
(
groupDTO
.
getGroupId
()))
{
groupDTO
.
setDefaultFlag
(
0
);
...
...
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