Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
8c1d3976
Commit
8c1d3976
authored
Apr 22, 2022
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
草稿状态的隐患没有隐患操作记录
parent
11702b95
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
LatentDangerServiceImpl.java
...danger/business/service/impl/LatentDangerServiceImpl.java
+5
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @
8c1d3976
...
...
@@ -294,7 +294,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if
(!
ValidationUtil
.
isEmpty
(
param
.
getPhotoUrl
()))
{
flowJson
.
put
(
"photoUrls"
,
Joiner
.
on
(
","
).
join
(
param
.
getPhotoUrl
()));
}
if
(
ValidationUtil
.
isEmpty
(
param
.
getId
()))
{
if
(
ValidationUtil
.
isEmpty
(
param
.
getId
())
&&
!
"draft"
.
equals
(
latentDanger
.
getDangerState
())
)
{
// 第一次保存隐患提交记录
LatentDangerFlowRecord
inputRecord
=
saveFlowRecord
(
instance
.
getString
(
"id"
),
"提交隐患"
,
userId
,
departmentId
,
flowJson
,
latentDanger
.
getId
(),
role
,
...
...
@@ -2314,6 +2314,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if
(!
ValidationUtil
.
isEmpty
(
latentDangerList
))
{
// 防火监督报告用该字段(复核执行人名称)
latentDangerList
.
forEach
(
danger
->
{
List
<
LatentDangerFlowRecordBo
>
recordList
=
latentDangerFlowRecordMapper
.
listByDangerId
(
danger
.
getId
());
if
(!
ValidationUtil
.
isEmpty
(
recordList
))
{
List
<
LatentDangerState
.
SupervisionDangerStateEnum
>
stateEnums
=
LatentDangerState
.
SupervisionDangerStateEnum
...
...
@@ -2325,7 +2326,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List
<
LatentDangerFlowRecordBo
>
firstRecord
=
recordList
.
stream
().
filter
(
r
->
LatentDangerState
.
SupervisionDangerStateEnum
.
提交隐患
.
getCode
().
equals
(
r
.
getActionFlag
()))
.
collect
(
Collectors
.
toList
());
danger
.
setCheckUserName
(
firstRecord
.
get
(
0
).
getExecuteUserName
());
if
(
firstRecord
!=
null
&&
firstRecord
.
size
()>
0
)
{
danger
.
setCheckUserName
(
firstRecord
.
get
(
0
).
getExecuteUserName
());
}
recordList
=
recordList
.
stream
().
filter
(
r
->
stateSet
.
contains
(
r
.
getDangerState
()))
.
collect
(
Collectors
.
toList
());
Set
<
String
>
nameSet
=
Sets
.
newHashSet
();
...
...
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