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
68fda192
Commit
68fda192
authored
Jun 08, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
829a77d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
ApplicationApiServiceImpl.java
...e/service/service/out/impl/ApplicationApiServiceImpl.java
+17
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationApiServiceImpl.java
View file @
68fda192
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
;
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -12,11 +13,15 @@ import cn.hutool.core.collection.CollectionUtil;
...
@@ -12,11 +13,15 @@ import cn.hutool.core.collection.CollectionUtil;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.haoban.manage.api.dto.ApplicationDTO
;
import
com.gic.haoban.manage.api.dto.ApplicationDTO
;
import
com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO
;
import
com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO
;
import
com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO
;
import
com.gic.haoban.manage.api.service.ApplicationApiService
;
import
com.gic.haoban.manage.api.service.ApplicationApiService
;
import
com.gic.haoban.manage.service.dao.mapper.ApplicationMapper
;
import
com.gic.haoban.manage.service.dao.mapper.ApplicationMapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanApplication
;
import
com.gic.haoban.manage.service.entity.TabHaobanApplication
;
import
com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated
;
import
com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated
;
import
com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated
;
import
com.gic.haoban.manage.service.service.ApplicationService
;
import
com.gic.haoban.manage.service.service.ApplicationService
;
import
com.gic.haoban.manage.service.service.TemplateApplicationRelatedService
;
import
com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService
;
import
com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService
;
import
com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -30,6 +35,10 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
...
@@ -30,6 +35,10 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private
ApplicationMapper
applicationMapper
;
private
ApplicationMapper
applicationMapper
;
@Autowired
@Autowired
private
WxEnterpriseApplicationRelatedService
wxEnterpriseApplicationRelatedService
;
private
WxEnterpriseApplicationRelatedService
wxEnterpriseApplicationRelatedService
;
@Autowired
private
TemplateEnterpriseRelatedService
templateEnterpriseRelatedService
;
@Autowired
private
TemplateApplicationRelatedService
templateApplicationRelatedService
;
@Override
@Override
public
List
<
ApplicationDTO
>
listApplication
()
{
public
List
<
ApplicationDTO
>
listApplication
()
{
List
<
TabHaobanApplication
>
list
=
applicationService
.
listApplication
();
List
<
TabHaobanApplication
>
list
=
applicationService
.
listApplication
();
...
@@ -53,8 +62,14 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
...
@@ -53,8 +62,14 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override
@Override
public
List
<
ApplicationDTO
>
listApplicationByWxEnterpriseId
(
String
wxEnterpriseId
)
{
public
List
<
ApplicationDTO
>
listApplicationByWxEnterpriseId
(
String
wxEnterpriseId
)
{
List
<
TabHaobanApplication
>
list
=
applicationService
.
listApplication
();
List
<
TabHaobanApplication
>
list
=
applicationService
.
listApplication
();
List
<
TabHaobanWxEnterpriseApplicationRelated
>
relatedList
=
wxEnterpriseApplicationRelatedService
.
listByWxEnterpriseId
(
wxEnterpriseId
);
TemplateEnterpriseRelatedDTO
template
=
templateEnterpriseRelatedService
.
selectByWxEnterpriseId
(
wxEnterpriseId
);
List
<
String
>
applicationIds
=
relatedList
.
stream
().
map
(
s
->
s
.
getApplicationId
()).
collect
(
Collectors
.
toList
());
if
(
template
==
null
){
return
Collections
.
EMPTY_LIST
;
}
List
<
TabHaobanTemplateApplicationRelated
>
applicatinList
=
templateApplicationRelatedService
.
listByTemplateId
(
template
.
getApplicationTemplateId
());
//List<TabHaobanWxEnterpriseApplicationRelated> relatedList = wxEnterpriseApplicationRelatedService.listByWxEnterpriseId(wxEnterpriseId);
List
<
String
>
applicationIds
=
applicatinList
.
stream
().
map
(
s
->
s
.
getApplicationId
()).
collect
(
Collectors
.
toList
());
List
<
TabHaobanApplication
>
result
=
new
ArrayList
<
TabHaobanApplication
>();
List
<
TabHaobanApplication
>
result
=
new
ArrayList
<
TabHaobanApplication
>();
for
(
TabHaobanApplication
tabHaobanApplication
:
list
)
{
for
(
TabHaobanApplication
tabHaobanApplication
:
list
)
{
if
(
applicationIds
.
contains
(
tabHaobanApplication
.
getApplicationId
())){
if
(
applicationIds
.
contains
(
tabHaobanApplication
.
getApplicationId
())){
...
...
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