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
0e18f038
Commit
0e18f038
authored
May 19, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
cd2c5f24
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
LatentDangerServiceImpl.java
...danger/business/service/impl/LatentDangerServiceImpl.java
+2
-1
PlanServiceImpl.java
...os/supervision/business/service/impl/PlanServiceImpl.java
+1
-0
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 @
0e18f038
...
...
@@ -2385,8 +2385,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List
<
LatentDangerFlowRecord
>
recordList
=
latentDangerFlowRecordService
.
list
(
recordQueryWrapper
);
if
(!
ValidationUtil
.
isEmpty
(
recordList
))
{
recordList
.
forEach
(
r
->
r
.
setDeleted
(
true
));
//草稿状态下的隐患不存在隐患操作记录
latentDangerFlowRecordService
.
saveOrUpdateBatch
(
recordList
);
}
latentDangerFlowRecordService
.
saveOrUpdateBatch
(
recordList
);
LambdaQueryWrapper
<
LatentDanger
>
dangerQueryWrapper
=
new
LambdaQueryWrapper
<>();
dangerQueryWrapper
.
in
(
LatentDanger:
:
getId
,
dangerIdList
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java
View file @
0e18f038
...
...
@@ -261,6 +261,7 @@ public class PlanServiceImpl implements IPlanService {
}
else
{
if
(
PlanStatusEnum
.
EXAMINE_THREE
.
getValue
()
!=
status
){
rulePlanService
.
addPlanAuditRule
(
plan
,
userIds
,
RuleTypeEnum
.
计划审核
,
ExecuteStateNameEnum
.
getNameByCode
(
excuteState
));
// 计划审核
rulePlanService
.
addPlanAuditRule
(
plan
,
userIds
,
RuleTypeEnum
.
计划审核任务
,
ExecuteStateNameEnum
.
getNameByCode
(
excuteState
));
// 计划审核任务通知
}
else
{
rulePlanService
.
addPlanAuditRule
(
plan
,
userIds
,
RuleTypeEnum
.
计划审核完成
,
ExecuteStateNameEnum
.
getNameByCode
(
excuteState
));
// 计划审核完成
}
...
...
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