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
26576174
Commit
26576174
authored
Jun 25, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-在复审通过后再修改学习内容下的展板参考资料再app端显示
parent
f327aed7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
32 deletions
+27
-32
AuditServiceImpl.java
...ava/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
+27
-0
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+0
-32
No files found.
src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
26576174
...
...
@@ -19,9 +19,11 @@ import org.apache.commons.lang3.StringUtils;
import
org.apache.shiro.SecurityUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.CollectionUtils
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -70,6 +72,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
@Resource
private
LearningContentAssetService
learningContentAssetService
;
@Resource
private
AssetService
assetService
;
@Override
public
Page
<
Audit
>
getUserList
(
Page
<
Audit
>
page
,
TUser
user
)
{
return
page
.
setRecords
(
auditMapper
.
getUserList
(
page
,
user
));
...
...
@@ -543,6 +548,28 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
}
one
.
setAuditStatus
(
audit
.
getStatus
());
update
=
this
.
learningContentService
.
updateById
(
one
);
// 修改学习内容下的展板参考资料在app显示
LambdaUpdateWrapper
<
LearningContentAsset
>
updateWrapper
=
Wrappers
.
lambdaUpdate
();
updateWrapper
.
eq
(
LearningContentAsset:
:
getLearningContentId
,
one
.
getId
());
// 删除原有信息
this
.
learningContentAssetService
.
remove
(
updateWrapper
);
// 新增
List
<
String
>
fileList
=
learningContent
.
getFileList
();
if
(!
CollectionUtils
.
isEmpty
(
fileList
))
{
LambdaQueryWrapper
<
Asset
>
queryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
in
(
Asset:
:
getId
,
fileList
);
List
<
Asset
>
list1
=
this
.
assetService
.
list
(
queryWrapper
);
ArrayList
<
LearningContentAsset
>
learningContentAssets
=
new
ArrayList
<>();
list1
.
forEach
(
asset
->
{
LearningContentAsset
learningContentAsset
=
LearningContentAsset
.
builder
()
.
learningContentId
(
learningContent
.
getId
())
.
boardId
(
asset
.
getRefItemId
())
.
assetId
(
asset
.
getId
())
.
build
();
learningContentAssets
.
add
(
learningContentAsset
);
});
this
.
learningContentAssetService
.
saveBatch
(
learningContentAssets
);
}
break
;
default
:
}
...
...
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
26576174
...
...
@@ -246,38 +246,6 @@ public class LearningContentController extends BaseController {
}
}
// 学习内容下显示的参考信息被修改
LambdaQueryWrapper
<
LearningContentAsset
>
lambdaQuery
=
Wrappers
.
lambdaQuery
();
lambdaQuery
.
eq
(
LearningContentAsset:
:
getLearningContentId
,
one
.
getId
());
lambdaQuery
.
select
(
LearningContentAsset:
:
getAssetId
);
List
<
String
>
list
=
this
.
learningContentAssetService
.
listObjs
(
lambdaQuery
,
Object:
:
toString
);
if
(!
ListUtil
.
compareValue
(
list
,
learningContent
.
getFileList
()))
{
LambdaUpdateWrapper
<
LearningContentAsset
>
updateWrapper
=
Wrappers
.
lambdaUpdate
();
updateWrapper
.
eq
(
LearningContentAsset:
:
getLearningContentId
,
one
.
getId
());
// 删除原有信息
this
.
learningContentAssetService
.
remove
(
updateWrapper
);
// 新增
List
<
String
>
fileList
=
learningContent
.
getFileList
();
if
(!
CollectionUtils
.
isEmpty
(
fileList
))
{
LambdaQueryWrapper
<
Asset
>
queryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
in
(
Asset:
:
getId
,
fileList
);
List
<
Asset
>
list1
=
this
.
assetService
.
list
(
queryWrapper
);
ArrayList
<
LearningContentAsset
>
learningContentAssets
=
new
ArrayList
<>();
list1
.
forEach
(
asset
->
{
LearningContentAsset
learningContentAsset
=
LearningContentAsset
.
builder
()
.
learningContentId
(
learningContent
.
getId
())
.
boardId
(
asset
.
getRefItemId
())
.
assetId
(
asset
.
getId
())
.
build
();
learningContentAssets
.
add
(
learningContentAsset
);
});
boolean
b
=
this
.
learningContentAssetService
.
saveBatch
(
learningContentAssets
);
if
(!
b
)
{
return
getFailResult
(
"更新数据失败!"
);
}
}
}
one
.
setAuditStatus
(
AuditStatusEnum
.
TBC
.
name
());
this
.
learningContentService
.
updateById
(
one
);
...
...
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