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
bdd83375
Commit
bdd83375
authored
Apr 27, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
125805fe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
46 deletions
+7
-46
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+0
-18
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+0
-19
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+7
-9
No files found.
src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
bdd83375
...
...
@@ -353,15 +353,6 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard
.
setDatumIdList
(
datumList
.
stream
().
map
(
Asset:
:
getId
).
collect
(
Collectors
.
toList
()));
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
exhibitionBoard
.
getId
());
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
);
exhibitionBoard
.
setAuditHistoryList
(
auditList
);
...
...
@@ -421,15 +412,6 @@ public class ExhibitionBoardController extends BaseController {
}
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
exhibitionBoard
.
getId
());
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
);
exhibitionBoard
.
setAuditHistoryList
(
auditList
);
...
...
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
bdd83375
...
...
@@ -360,15 +360,6 @@ public class LearningContentController extends BaseController {
}
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
);
...
...
@@ -464,17 +455,7 @@ public class LearningContentController extends BaseController {
}
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
);
...
...
src/main/java/cn/chnmuseum/party/web/controller/VideoContentController.java
View file @
bdd83375
...
...
@@ -101,6 +101,7 @@ public class VideoContentController extends BaseController {
.
content
(
videoContent
.
getName
())
.
name
(
videoContent
.
getName
())
.
userId
(
getcurUser
().
getId
())
.
organId
(
getcurUser
().
getOrgId
())
.
refItemId
(
videoContent
.
getId
())
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
ADD
.
name
())
...
...
@@ -148,6 +149,7 @@ public class VideoContentController extends BaseController {
.
content
(
videoContent
.
getName
())
.
name
(
videoContent
.
getName
())
.
userId
(
getcurUser
().
getId
())
.
organId
(
getcurUser
().
getOrgId
())
.
refItemId
(
videoContent
.
getId
())
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
EDIT
.
name
())
...
...
@@ -292,6 +294,11 @@ public class VideoContentController extends BaseController {
final
List
<
Asset
>
videoFileList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
videoContent
.
setVideoFileList
(
videoFileList
);
videoContent
.
setVideoFileIdList
(
videoFileList
.
stream
().
map
(
Asset:
:
getId
).
collect
(
Collectors
.
toList
()));
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
videoContent
.
setAuditHistoryList
(
auditList
);
return
getResult
(
videoContent
);
}
...
...
@@ -325,15 +332,6 @@ public class VideoContentController extends BaseController {
videoContent
.
setVideoFileIdList
(
videoFileList
.
stream
().
map
(
Asset:
:
getId
).
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
);
videoContent
.
setAuditHistoryList
(
auditList
);
...
...
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