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
9673ee8e
Commit
9673ee8e
authored
Apr 06, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
dac1cb0f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
97 additions
and
50 deletions
+97
-50
LearningContentBoardMapper.java
...gy/chnmuseum/party/mapper/LearningContentBoardMapper.java
+35
-4
Asset.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
+10
-2
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+52
-44
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
9673ee8e
...
@@ -32,28 +32,59 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
...
@@ -32,28 +32,59 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
IPage
<
ExhibitionBoard
>
selectBoardPageByLearningContentId
(
Page
<?>
page
,
String
learningContentId
,
String
nameOrCode
);
IPage
<
ExhibitionBoard
>
selectBoardPageByLearningContentId
(
Page
<?>
page
,
String
learningContentId
,
String
nameOrCode
);
@Select
(
"SELECT t.* FROM "
+
@Select
(
"SELECT t.* FROM "
+
"(SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
"("
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and vc.id = a.ref_item_id "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.organ_code = #{organCode} "
+
"and lc.organ_code = #{organCode} "
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.organ_code = #{organCode} "
+
"UNION "
+
"UNION "
+
"SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"SELECT a.*
, eb.id exhibition_board_id, eb.name exhibition_board_name
FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and vc.id = a.ref_item_id "
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+
"and lc.organ_code like CONCAT(#{organCode},'%') "
+
"and lc.organ_code like CONCAT(#{organCode},'%') "
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB' "
+
"and lc.organ_code = #{organCode} "
+
"UNION "
+
"UNION "
+
"SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"SELECT a.*
, eb.id exhibition_board_id, eb.name exhibition_board_name
FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and vc.id = a.ref_item_id "
+
"and lc.applicable_scope = 'ALL_PLAT') t"
+
"and lc.applicable_scope = 'ALL_PLAT'"
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+
"WHERE lcb.learning_content_id = lc.id "
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.id = a.ref_item_id "
+
"and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'ALL_PLAT'"
+
") t"
)
)
IPage
<
Asset
>
selectAssetPageByOrganCode
(
Page
<?>
page
,
String
organCode
);
IPage
<
Asset
>
selectAssetPageByOrganCode
(
Page
<?>
page
,
String
organCode
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
View file @
9673ee8e
...
@@ -29,11 +29,11 @@ public class Asset implements Serializable {
...
@@ -29,11 +29,11 @@ public class Asset implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"文件资产ID"
)
@ApiModelProperty
(
"文件资产ID
/参考资料ID
"
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
ASSIGN_ID
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
private
String
id
;
@ApiModelProperty
(
"所属项ID"
)
@ApiModelProperty
(
"所属项
(展板/视频内容)
ID"
)
@TableField
(
"ref_item_id"
)
@TableField
(
"ref_item_id"
)
private
String
refItemId
;
private
String
refItemId
;
...
@@ -85,4 +85,12 @@ public class Asset implements Serializable {
...
@@ -85,4 +85,12 @@ public class Asset implements Serializable {
@TableField
(
value
=
"update_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
@TableField
(
value
=
"update_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
updateTime
;
private
LocalDateTime
updateTime
;
@ApiModelProperty
(
"展板ID"
)
@TableField
(
exist
=
false
)
private
String
exhibitionBoardId
;
@ApiModelProperty
(
"展板名称"
)
@TableField
(
exist
=
false
)
private
String
exhibitionBoardName
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
9673ee8e
...
@@ -306,36 +306,28 @@ public class LearningContentController extends BaseController {
...
@@ -306,36 +306,28 @@ public class LearningContentController extends BaseController {
queryWrapper
.
select
(
LearningContentBoardCat:
:
getExhibitionBoardCatId
);
queryWrapper
.
select
(
LearningContentBoardCat:
:
getExhibitionBoardCatId
);
final
List
<
String
>
exhibitionBoardCatIdList
=
this
.
learningContentBoardCatService
.
listObjs
(
queryWrapper
,
Object:
:
toString
);
final
List
<
String
>
exhibitionBoardCatIdList
=
this
.
learningContentBoardCatService
.
listObjs
(
queryWrapper
,
Object:
:
toString
);
final
List
<
ExhibitionBoardCat
>
exhibitionBoardCats
=
this
.
exhibitionBoardCatService
.
listByIds
(
exhibitionBoardCatIdList
);
final
List
<
ExhibitionBoardCat
>
exhibitionBoardCats
=
this
.
exhibitionBoardCatService
.
listByIds
(
exhibitionBoardCatIdList
);
if
(!
exhibitionBoardCats
.
isEmpty
())
{
learningContent
.
setExhibitionBoardCatIdList
(
exhibitionBoardCats
.
stream
().
map
(
ExhibitionBoardCat:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardCatIdList
(
exhibitionBoardCats
.
stream
().
map
(
ExhibitionBoardCat:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardCatNameList
(
exhibitionBoardCats
.
stream
().
map
(
ExhibitionBoardCat:
:
getName
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardCatNameList
(
exhibitionBoardCats
.
stream
().
map
(
ExhibitionBoardCat:
:
getName
).
collect
(
Collectors
.
toList
()));
}
final
LambdaQueryWrapper
<
LearningContentCopyrightOwner
>
queryWrapper1
=
Wrappers
.<
LearningContentCopyrightOwner
>
lambdaQuery
().
eq
(
LearningContentCopyrightOwner:
:
getLearningContentId
,
id
);
final
LambdaQueryWrapper
<
LearningContentCopyrightOwner
>
queryWrapper1
=
Wrappers
.<
LearningContentCopyrightOwner
>
lambdaQuery
().
eq
(
LearningContentCopyrightOwner:
:
getLearningContentId
,
id
);
queryWrapper1
.
select
(
LearningContentCopyrightOwner:
:
getCopyrightOwnerId
);
queryWrapper1
.
select
(
LearningContentCopyrightOwner:
:
getCopyrightOwnerId
);
final
List
<
String
>
copyrightOwnerIdList
=
this
.
learningContentCopyrightOwnerService
.
listObjs
(
queryWrapper1
,
Object:
:
toString
);
final
List
<
String
>
copyrightOwnerIdList
=
this
.
learningContentCopyrightOwnerService
.
listObjs
(
queryWrapper1
,
Object:
:
toString
);
final
List
<
CopyrightOwner
>
copyrightOwnerList
=
this
.
copyrightOwnerService
.
listByIds
(
copyrightOwnerIdList
);
final
List
<
CopyrightOwner
>
copyrightOwnerList
=
this
.
copyrightOwnerService
.
listByIds
(
copyrightOwnerIdList
);
if
(!
copyrightOwnerList
.
isEmpty
())
{
learningContent
.
setCopyrightOwnerIdList
(
copyrightOwnerList
.
stream
().
map
(
CopyrightOwner:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setCopyrightOwnerIdList
(
copyrightOwnerList
.
stream
().
map
(
CopyrightOwner:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setCopyrightOwnerNameList
(
copyrightOwnerList
.
stream
().
map
(
CopyrightOwner:
:
getName
).
collect
(
Collectors
.
toList
()));
learningContent
.
setCopyrightOwnerNameList
(
copyrightOwnerList
.
stream
().
map
(
CopyrightOwner:
:
getName
).
collect
(
Collectors
.
toList
()));
}
final
LambdaQueryWrapper
<
LearningContentBoard
>
queryWrapper2
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
eq
(
LearningContentBoard:
:
getLearningContentId
,
id
);
final
LambdaQueryWrapper
<
LearningContentBoard
>
queryWrapper2
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
eq
(
LearningContentBoard:
:
getLearningContentId
,
id
);
queryWrapper2
.
select
(
LearningContentBoard:
:
getExhibitionBoardId
);
queryWrapper2
.
select
(
LearningContentBoard:
:
getExhibitionBoardId
);
final
List
<
String
>
exhibitionBoardIdList
=
this
.
learningContentBoardService
.
listObjs
(
queryWrapper2
,
Object:
:
toString
);
final
List
<
String
>
exhibitionBoardIdList
=
this
.
learningContentBoardService
.
listObjs
(
queryWrapper2
,
Object:
:
toString
);
if
(!
exhibitionBoardIdList
.
isEmpty
())
{
final
List
<
ExhibitionBoard
>
exhibitionBoardList
=
this
.
exhibitionBoardService
.
listByIds
(
exhibitionBoardIdList
);
final
List
<
ExhibitionBoard
>
exhibitionBoardList
=
this
.
exhibitionBoardService
.
listByIds
(
exhibitionBoardIdList
);
learningContent
.
setExhibitionBoardIdList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardIdList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardNameList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getName
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardNameList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getName
).
collect
(
Collectors
.
toList
()));
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
auditQueryWrapper
.
select
(
Audit:
:
getContent
);
auditQueryWrapper
.
select
(
Audit:
:
getType
);
auditQueryWrapper
.
select
(
Audit:
:
getOperation
);
auditQueryWrapper
.
select
(
Audit:
:
getStatus
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstTime
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstRemarks
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getLevel
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
learningContent
.
setAuditHistoryList
(
auditList
);
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
String
exhibitionBoardCatId
=
exhibitionBoard
.
getExhibitionBoardCatId
();
String
exhibitionBoardCatId
=
exhibitionBoard
.
getExhibitionBoardCatId
();
if
(
exhibitionBoardCatId
!=
null
)
{
if
(
exhibitionBoardCatId
!=
null
)
{
...
@@ -374,6 +366,22 @@ public class LearningContentController extends BaseController {
...
@@ -374,6 +366,22 @@ public class LearningContentController extends BaseController {
}
}
}
}
learningContent
.
setExhibitionBoardList
(
exhibitionBoardList
);
learningContent
.
setExhibitionBoardList
(
exhibitionBoardList
);
}
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
auditQueryWrapper
.
select
(
Audit:
:
getContent
);
auditQueryWrapper
.
select
(
Audit:
:
getType
);
auditQueryWrapper
.
select
(
Audit:
:
getOperation
);
auditQueryWrapper
.
select
(
Audit:
:
getStatus
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstTime
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstRemarks
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getLevel
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
learningContent
.
setAuditHistoryList
(
auditList
);
return
getResult
(
learningContent
);
return
getResult
(
learningContent
);
}
}
...
...
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