Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cash-loan-flow-boss
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QG
cash-loan-flow-boss
Commits
2120c03f
Commit
2120c03f
authored
Sep 24, 2019
by
suntao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
渠道列表查询 添加渠道名 模糊查询
parent
704e32c3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
ChannelConfController.java
...lowboss/api/channel/controller/ChannelConfController.java
+2
-2
ChannelConfService.java
...hloanflowboss/api/channel/service/ChannelConfService.java
+1
-1
ChannelConfServiceImpl.java
...nflowboss/api/channel/service/ChannelConfServiceImpl.java
+2
-2
CLFCenterService.java
...up/cashloanflowboss/spi/clf/service/CLFCenterService.java
+1
-1
CLFCenterServiceImpl.java
...ashloanflowboss/spi/clf/service/CLFCenterServiceImpl.java
+5
-2
No files found.
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/controller/ChannelConfController.java
View file @
2120c03f
...
...
@@ -39,11 +39,11 @@ public class ChannelConfController {
@Security
(
authorityId
=
"Channel.getChannelList"
)
@ChannelIdInit
(
channelIdSPEL
=
"#this[0]"
)
@PostMapping
(
"/info"
)
public
Result
channelList
(
Long
channelId
,
Integer
pageNumber
,
Integer
pageSize
)
{
public
Result
channelList
(
Long
channelId
,
String
channelName
,
Integer
pageNumber
,
Integer
pageSize
)
{
if
(
pageNumber
==
null
||
pageSize
==
null
)
{
return
Result
.
buildFial
(
"page信息不对"
);
}
return
Result
.
buildSuccess
(
channelConfService
.
getChannelInfo
(
pageNumber
,
pageSize
,
channelId
));
return
Result
.
buildSuccess
(
channelConfService
.
getChannelInfo
(
pageNumber
,
pageSize
,
channelId
,
channelName
));
}
/**
...
...
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfService.java
View file @
2120c03f
...
...
@@ -12,7 +12,7 @@ import org.springframework.data.domain.Page;
*/
public
interface
ChannelConfService
{
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
);
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
,
String
channelName
);
ChannelConfVo
getChannelConf
(
Long
channelId
);
...
...
src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfServiceImpl.java
View file @
2120c03f
...
...
@@ -39,9 +39,9 @@ public class ChannelConfServiceImpl implements ChannelConfService{
@Override
public
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
)
{
public
Page
<
ChannelListModel
>
getChannelInfo
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
,
String
channelName
)
{
Page
<
ClfChannelConfiguration
>
page
=
clfCenterService
.
findChannelConfigurationByCriteriaQueryPage
(
pageNumber
,
pageSize
,
channelId
);
Page
<
ClfChannelConfiguration
>
page
=
clfCenterService
.
findChannelConfigurationByCriteriaQueryPage
(
pageNumber
,
pageSize
,
channelId
,
channelName
);
Page
<
ChannelListModel
>
channelListModelPage
=
page
.
map
(
it
->
{
ChannelListModel
channelListModel
=
new
ChannelListModel
();
...
...
src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/service/CLFCenterService.java
View file @
2120c03f
...
...
@@ -23,7 +23,7 @@ public interface CLFCenterService {
List
<
ApplyRequestHistory
>
findApplyRequestHistoryBySpecification
(
OrderBaseModel
orderBaseModel
);
Page
<
ClfChannelConfiguration
>
findChannelConfigurationByCriteriaQueryPage
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
);
Page
<
ClfChannelConfiguration
>
findChannelConfigurationByCriteriaQueryPage
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
,
String
channelName
);
ClfChannelConfiguration
findChannelConfigurationByChannelId
(
Long
channelId
);
...
...
src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/service/CLFCenterServiceImpl.java
View file @
2120c03f
...
...
@@ -2,7 +2,6 @@ package cn.quantgroup.cashloanflowboss.spi.clf.service;
import
cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel
;
import
cn.quantgroup.cashloanflowboss.spi.clf.entity.*
;
import
cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType
;
import
cn.quantgroup.cashloanflowboss.spi.clf.repository.*
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -91,7 +90,7 @@ public class CLFCenterServiceImpl implements CLFCenterService{
}
@Override
public
Page
<
ClfChannelConfiguration
>
findChannelConfigurationByCriteriaQueryPage
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
)
{
public
Page
<
ClfChannelConfiguration
>
findChannelConfigurationByCriteriaQueryPage
(
Integer
pageNumber
,
Integer
pageSize
,
Long
channelId
,
String
channelName
)
{
return
clfChannelConfigurationRepository
.
findAll
((
root
,
criteriaQuery
,
criteriaBuilder
)
->
{
List
<
Predicate
>
predicates
=
new
ArrayList
<>();
...
...
@@ -101,6 +100,10 @@ public class CLFCenterServiceImpl implements CLFCenterService{
predicates
.
add
(
criteriaBuilder
.
equal
(
root
.
get
(
"registeredFrom"
),
channelId
.
longValue
()));
}
if
(
StringUtils
.
isNotEmpty
(
channelName
))
{
predicates
.
add
(
criteriaBuilder
.
like
(
root
.
get
(
"channelName"
),
"%"
+
channelName
+
"%"
));
}
// 设置查询条件
criteriaQuery
.
where
(
criteriaBuilder
.
and
(
predicates
.
toArray
(
new
Predicate
[
predicates
.
size
()])));
// 指定排序
...
...
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