Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
本
本级财政预算项目管理系统
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JAVA
本级财政预算项目管理系统
Merge requests
!93
no message
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
no message
feature/zhoushiqi
into
develop
Overview
0
Commits
1
Pipelines
1
Changes
1
Merged
周士琪
requested to merge
feature/zhoushiqi
into
develop
2 years ago
Overview
0
Commits
1
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Compare
develop
develop (base)
and
latest version
latest version
f17f9152
1 commit,
2 years ago
1 file
+
2
−
2
Expand all files
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
ServiceSite/src/main/java/com/seasky/budget/business/service/ExpertManuscriptServiceImpl.java
+
2
−
2
Options
@@ -245,7 +245,7 @@ public class ExpertManuscriptServiceImpl implements ExpertManuscriptService {
}
expert
.
setEntrustmentProjectOutList
(
entrustmentProjectOuts
);
if
(
ObjectUtils
.
isNotEmpty
(
entrustmentExpertManuscriptFilePOS
))
{
List
<
EntrustmentExpertManuscriptFilePO
>
expertFiles
=
entrustmentExpertManuscriptFilePOS
.
stream
().
filter
(
s
->
s
.
getExpertId
().
equals
(
expert
.
getExpert
Id
(
))).
collect
(
Collectors
.
toList
());
List
<
EntrustmentExpertManuscriptFilePO
>
expertFiles
=
entrustmentExpertManuscriptFilePOS
.
stream
().
filter
(
s
->
s
.
getExpertId
().
equals
(
Long
.
valueOf
(
expert
.
getExpert
Tel
()
))).
collect
(
Collectors
.
toList
());
if
(
ObjectUtils
.
isNotEmpty
(
expertFiles
))
{
expert
.
setIsHavingFile
(
true
);
}
@@ -261,7 +261,7 @@ public class ExpertManuscriptServiceImpl implements ExpertManuscriptService {
expert
.
setManuscriptCompletedCount
(
0
);
expert
.
setEntrustmentProjectOutList
(
Collections
.
emptyList
());
if
(
ObjectUtils
.
isNotEmpty
(
entrustmentExpertManuscriptFilePOS
))
{
List
<
EntrustmentExpertManuscriptFilePO
>
expertFiles
=
entrustmentExpertManuscriptFilePOS
.
stream
().
filter
(
s
->
s
.
getExpertId
().
equals
(
expert
.
getExpert
Id
(
))).
collect
(
Collectors
.
toList
());
List
<
EntrustmentExpertManuscriptFilePO
>
expertFiles
=
entrustmentExpertManuscriptFilePOS
.
stream
().
filter
(
s
->
s
.
getExpertId
().
equals
(
Long
.
valueOf
(
expert
.
getExpert
Tel
()
))).
collect
(
Collectors
.
toList
());
if
(
ObjectUtils
.
isNotEmpty
(
expertFiles
))
{
expert
.
setIsHavingFile
(
true
);
}