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
998dbb38
Commit
998dbb38
authored
Jun 02, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改appbug
parent
7d01fdaf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
LearningContentBoardMapper.java
...cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
+6
-6
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+1
-1
No files found.
src/main/java/cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
998dbb38
...
...
@@ -50,7 +50,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
...
...
@@ -60,7 +60,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
...
...
@@ -75,7 +75,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
...
...
@@ -85,7 +85,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
...
...
@@ -99,7 +99,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'ALL_PLAT'"
...
...
@@ -109,7 +109,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 "
+
"and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0
and lc.is_deleted = 0
"
+
"and a.is_published = 1 "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
...
...
src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
998dbb38
...
...
@@ -451,7 +451,7 @@ public class ChinaMobileRestApiController extends BaseController {
}
exhibitionBoard
.
setDatumList
(
datumList
);
videoList
.
addAll
(
datumList
.
stream
().
filter
(
x
->
FileTypeEnum
.
VIDEO
.
name
().
equalsIgnoreCase
(
x
.
getFileType
())).
collect
(
Collectors
.
toList
()));
//
videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
exhibitionBoard
.
setVideoList
(
videoList
);
}
return
getResult
(
page
);
...
...
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