Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
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
base_platform_enterprise
gic-data-cloud
Commits
6f5f060c
Commit
6f5f060c
authored
Sep 08, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增 门店启用策略修改:允许条件为空,即所有门店
parent
0e00894f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
TabDataExplainMapper.java
...n/java/com/gic/cloud/dao/mapper/TabDataExplainMapper.java
+3
-2
TabIndexMapper.java
...rc/main/java/com/gic/cloud/dao/mapper/TabIndexMapper.java
+3
-2
DataExplainApiServiceImpl.java
...c/cloud/service/outer/impl/DataExplainApiServiceImpl.java
+5
-5
No files found.
gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabDataExplainMapper.java
View file @
6f5f060c
...
...
@@ -74,8 +74,8 @@ public interface TabDataExplainMapper {
* @Title: listDataExplain
* @Description:
* @author zhiwj
* @param dataExplainQ
O
* @param dataExplainQ
o
* @return com.github.pagehelper.Page<com.gic.cloud.entity.TabDataExplain>
*/
Page
<
TabDataExplain
>
listDataExplain
(
DataExplainQo
dataExplainQ
O
);
Page
<
TabDataExplain
>
listDataExplain
(
DataExplainQo
dataExplainQ
o
);
}
\ No newline at end of file
gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexMapper.java
View file @
6f5f060c
...
...
@@ -74,8 +74,8 @@ public interface TabIndexMapper {
* @Title: listIndex
* @Description:
* @author guojuxing
* @param indexQ
O
* @param indexQ
o
* @return com.github.pagehelper.Page<com.gic.cloud.entity.TabIndex>
*/
Page
<
TabIndex
>
listIndex
(
IndexQo
indexQ
O
);
Page
<
TabIndex
>
listIndex
(
IndexQo
indexQ
o
);
}
\ No newline at end of file
gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/DataExplainApiServiceImpl.java
View file @
6f5f060c
...
...
@@ -79,8 +79,8 @@ public class DataExplainApiServiceImpl implements DataExplainApiService {
}
@Override
public
ServiceResponse
<
Page
<
DataExplainDTO
>>
listDataExplain
(
DataExplainQo
dataExplainQ
O
)
{
com
.
github
.
pagehelper
.
Page
<
TabDataExplain
>
listDataExplain
=
this
.
dataExplainService
.
listDataExplain
(
dataExplainQ
O
);
public
ServiceResponse
<
Page
<
DataExplainDTO
>>
listDataExplain
(
DataExplainQo
dataExplainQ
o
)
{
com
.
github
.
pagehelper
.
Page
<
TabDataExplain
>
listDataExplain
=
this
.
dataExplainService
.
listDataExplain
(
dataExplainQ
o
);
Page
<
DataExplainDTO
>
dtoPage
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
listDataExplain
,
DataExplainDTO
.
class
);
return
EnterpriseServiceResponse
.
success
(
dtoPage
);
}
...
...
@@ -121,9 +121,9 @@ public class DataExplainApiServiceImpl implements DataExplainApiService {
@Override
public
ServiceResponse
<
DataExplainDTO
>
listByModule
(
String
moduleId
)
{
DataExplainQo
dataExplainQ
O
=
new
DataExplainQo
();
dataExplainQ
O
.
setModuleId
(
moduleId
);
List
<
TabDataExplain
>
dataExplainList
=
dataExplainService
.
listAllDataExplain
(
dataExplainQ
O
);
DataExplainQo
dataExplainQ
o
=
new
DataExplainQo
();
dataExplainQ
o
.
setModuleId
(
moduleId
);
List
<
TabDataExplain
>
dataExplainList
=
dataExplainService
.
listAllDataExplain
(
dataExplainQ
o
);
if
(
CollectionUtils
.
isNotEmpty
(
dataExplainList
))
{
return
EnterpriseServiceResponse
.
success
(
EntityUtil
.
changeEntityByJSON
(
DataExplainDTO
.
class
,
dataExplainList
.
get
(
0
)));
}
else
{
...
...
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