Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
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
liqin
chnmuseum-party
Commits
3336ce89
Commit
3336ce89
authored
May 17, 2021
by
jiawei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修改===》》》修改学习内容展板列表排序问题
parent
056b90a2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
LearningContentBoardMapper.java
...cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
+1
-1
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+3
-3
No files found.
src/main/java/cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
3336ce89
...
@@ -38,7 +38,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -38,7 +38,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
"OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') "
+
"OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') "
+
"OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))"
"OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))"
+
"</if>"
+
"</if>"
+
"order by lcb.sortorder
desc
"
+
"order by lcb.sortorder
DESC, eb.create_time DESC
"
+
"</script>"
+
"</script>"
)
)
IPage
<
ExhibitionBoard
>
selectBoardPageByLearningContentId
(
Page
<?>
page
,
String
learningContentId
,
String
nameOrCode
);
IPage
<
ExhibitionBoard
>
selectBoardPageByLearningContentId
(
Page
<?>
page
,
String
learningContentId
,
String
nameOrCode
);
...
...
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
3336ce89
...
@@ -435,11 +435,11 @@ public class LearningContentController extends BaseController {
...
@@ -435,11 +435,11 @@ public class LearningContentController extends BaseController {
}
}
});
});
});
});
exhibitionBoardList
=
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)).
collect
(
Collectors
.
toList
());
exhibitionBoardList
=
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)
.
reversed
()
).
collect
(
Collectors
.
toList
());
if
(!
exhibitionBoardList
.
isEmpty
())
{
if
(!
exhibitionBoardList
.
isEmpty
())
{
learningContent
.
setExhibitionBoardIdList
(
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)).
map
(
ExhibitionBoard:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardIdList
(
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)
.
reversed
()
).
map
(
ExhibitionBoard:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardNameList
(
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)).
map
(
ExhibitionBoard:
:
getName
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardNameList
(
exhibitionBoardList
.
stream
().
sorted
(
Comparator
.
comparing
(
ExhibitionBoard:
:
getSortorder
)
.
reversed
()
).
map
(
ExhibitionBoard:
:
getName
).
collect
(
Collectors
.
toList
()));
}
}
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
...
...
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