Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
Overview
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
胡园园
yanxuan-qc-change-system
Commits
f370aef1
Commit
f370aef1
authored
Dec 15, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:延期只校验延期时间
parent
813e3c2c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
16 deletions
+6
-16
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+5
-15
ChangeFlowSubmitReq.java
...anxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java
+1
-1
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
f370aef1
...
@@ -570,7 +570,7 @@ public class ChangeFlowBiz {
...
@@ -570,7 +570,7 @@ public class ChangeFlowBiz {
changeFlowService
.
updateRecord
(
changeRecord
);
changeFlowService
.
updateRecord
(
changeRecord
);
// 更新行动执行方案,覆盖操作,先删除,后插入
// 更新行动执行方案,覆盖操作,先删除,后插入
Integer
changeExecCount
=
changeFlowExecService
.
deleteByChangeRecordId
(
changeRecord
.
getId
());
Integer
changeExecCount
=
changeFlowExecService
.
deleteByChangeRecordId
(
changeRecord
.
getId
());
log
.
info
(
"[CHANGE_FLOW_SUBMIT] delete
changeExecCount:{}"
,
changeExecCount
);
log
.
info
(
"[CHANGE_FLOW_SUBMIT] delete
id:{}, changeExecCount:{}"
,
changeRecord
.
getId
()
,
changeExecCount
);
// 保存变更行动方案记录
// 保存变更行动方案记录
List
<
ChangeExecRecord
>
changeExecRecords
=
buildChangeExecRecord
(
changeRecord
.
getId
(),
List
<
ChangeExecRecord
>
changeExecRecords
=
buildChangeExecRecord
(
changeRecord
.
getId
(),
changeFlowSubmitReq
.
getChangeExecProjectList
());
changeFlowSubmitReq
.
getChangeExecProjectList
());
...
@@ -758,26 +758,16 @@ public class ChangeFlowBiz {
...
@@ -758,26 +758,16 @@ public class ChangeFlowBiz {
return
cancelNode
;
return
cancelNode
;
case
DELAY:
case
DELAY:
// 延期不流转工单
// 延期不流转工单
l
ong
changeConfirmResultTime
=
changeFlowSubmitReq
.
getChangeConfirmResultTime
();
L
ong
changeConfirmResultTime
=
changeFlowSubmitReq
.
getChangeConfirmResultTime
();
Long
tomorrowSpecificTime
=
DateUtils
.
getTomorrowSpecificTime
(
"09:00:00"
);
Long
tomorrowSpecificTime
=
DateUtils
.
getTomorrowSpecificTime
(
"09:00:00"
);
Assert
.
isTrue
(
changeConfirmResultTime
>=
tomorrowSpecificTime
,
"时间不可晚于下次执行时间"
);
Assert
.
isTrue
(
List
<
ChangeExecConfigReq
>
execProjectList1
=
changeFlowSubmitReq
.
getChangeExecProjectList
();
changeConfirmResultTime
!=
null
&&
changeConfirmResultTime
>=
tomorrowSpecificTime
,
List
<
ChangeExecRecord
>
changeExecRecords1
=
execProjectList1
.
stream
().
map
(
exec
->
{
"时间不可晚于下次执行时间"
);
Long
changeExecFinishTime
=
exec
.
getChangeExecFinishTime
();
Assert
.
notNull
(
changeExecFinishTime
,
"行动完成时间不可为空"
+
exec
.
getChangeTemplateId
());
ChangeExecRecord
changeExecRecord
=
new
ChangeExecRecord
();
changeExecRecord
.
setId
(
exec
.
getChangeExecId
());
changeExecRecord
.
setChangeExecFinishTime
(
exec
.
getChangeExecFinishTime
());
changeExecRecord
.
setChangeExecFinishDesc
(
exec
.
getChangeExecFinishDesc
());
return
changeExecRecord
;
}).
collect
(
Collectors
.
toList
());
changeRecord
.
setState
(
ChangeStatusEnum
.
DELAY
.
getStatus
());
changeRecord
.
setState
(
ChangeStatusEnum
.
DELAY
.
getStatus
());
// 更改变更结果确认时间
// 更改变更结果确认时间
changeRecord
.
setChangeConfirmResultTime
(
changeConfirmResultTime
);
changeRecord
.
setChangeConfirmResultTime
(
changeConfirmResultTime
);
changeRecord
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
changeRecord
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
changeFlowService
.
updateRecord
(
changeRecord
);
changeFlowService
.
updateRecord
(
changeRecord
);
changeExecRecords1
.
forEach
(
exec
->
changeFlowExecService
.
update
(
exec
));
// 变更行动项
return
null
;
return
null
;
default
:
default
:
return
null
;
return
null
;
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java
View file @
f370aef1
...
@@ -92,7 +92,7 @@ public class ChangeFlowSubmitReq {
...
@@ -92,7 +92,7 @@ public class ChangeFlowSubmitReq {
/**
/**
* 变更结果确认时间,时间戳
* 变更结果确认时间,时间戳
*/
*/
private
l
ong
changeConfirmResultTime
;
private
L
ong
changeConfirmResultTime
;
/**
/**
* 变更行动项
* 变更行动项
*/
*/
...
...
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