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
yx-qc-change-flow
yanxuan-qc-change-system
Commits
da06f085
Commit
da06f085
authored
Dec 07, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug:变更行动项数据变更ID错误
parent
edbd35f7
Pipeline
#43438
passed with stages
in 1 minute 28 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+3
-3
ChangeFlowExecServiceImpl.java
...an/change/biz/service/impl/ChangeFlowExecServiceImpl.java
+1
-1
ChangeExecConfigReq.java
...anxuan/change/dal/meta/model/req/ChangeExecConfigReq.java
+4
-0
ChangeFlowExecVO.java
...il/yanxuan/change/dal/meta/model/vo/ChangeFlowExecVO.java
+5
-0
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
da06f085
...
@@ -362,7 +362,7 @@ public class ChangeFlowBiz {
...
@@ -362,7 +362,7 @@ public class ChangeFlowBiz {
String
currentNode
,
ChangeFlowSubmitReq
changeFlowSubmitReq
)
{
String
currentNode
,
ChangeFlowSubmitReq
changeFlowSubmitReq
)
{
ChangeFlowEnum
node
=
ChangeFlowEnum
.
getByNodeId
(
currentNode
);
ChangeFlowEnum
node
=
ChangeFlowEnum
.
getByNodeId
(
currentNode
);
Assert
.
notNull
(
node
,
"节点配置不存在"
);
Assert
.
notNull
(
node
,
"节点配置不存在"
);
log
.
debug
(
"[checkUpdateAndSubmit] flo
e
Id:{}, nodeEnum:{}, changeFlowSubmitReq:{}"
,
flowId
,
node
,
log
.
debug
(
"[checkUpdateAndSubmit] flo
w
Id:{}, nodeEnum:{}, changeFlowSubmitReq:{}"
,
flowId
,
node
,
JSON
.
toJSONString
(
changeFlowSubmitReq
));
JSON
.
toJSONString
(
changeFlowSubmitReq
));
// 工单流传
// 工单流传
Map
<
String
,
Object
>
content
=
new
HashMap
<>(
CommonConstants
.
INIT_HASH_MAP_SIZE
);
Map
<
String
,
Object
>
content
=
new
HashMap
<>(
CommonConstants
.
INIT_HASH_MAP_SIZE
);
...
@@ -437,7 +437,7 @@ public class ChangeFlowBiz {
...
@@ -437,7 +437,7 @@ public class ChangeFlowBiz {
Long
changeExecFinishTime
=
exec
.
getChangeExecFinishTime
();
Long
changeExecFinishTime
=
exec
.
getChangeExecFinishTime
();
Assert
.
notNull
(
changeExecFinishTime
,
"行动完成时间不可为空"
+
exec
.
getChangeTemplateId
());
Assert
.
notNull
(
changeExecFinishTime
,
"行动完成时间不可为空"
+
exec
.
getChangeTemplateId
());
ChangeExecRecord
changeExecRecord
=
new
ChangeExecRecord
();
ChangeExecRecord
changeExecRecord
=
new
ChangeExecRecord
();
changeExecRecord
.
setId
(
exec
.
getChange
Template
Id
());
changeExecRecord
.
setId
(
exec
.
getChange
Exec
Id
());
changeExecRecord
.
setChangeExecFinishTime
(
exec
.
getChangeExecFinishTime
());
changeExecRecord
.
setChangeExecFinishTime
(
exec
.
getChangeExecFinishTime
());
changeExecRecord
.
setChangeExecFinishDesc
(
exec
.
getChangeExecFinishDesc
());
changeExecRecord
.
setChangeExecFinishDesc
(
exec
.
getChangeExecFinishDesc
());
return
changeExecRecord
;
return
changeExecRecord
;
...
@@ -606,7 +606,7 @@ public class ChangeFlowBiz {
...
@@ -606,7 +606,7 @@ public class ChangeFlowBiz {
List
<
Long
>
itemIds
=
itemList
.
stream
().
map
(
ItemVO:
:
getItemId
).
collect
(
Collectors
.
toList
());
List
<
Long
>
itemIds
=
itemList
.
stream
().
map
(
ItemVO:
:
getItemId
).
collect
(
Collectors
.
toList
());
// 批量查询spu信息
// 批量查询spu信息
List
<
SpuTO
>
spuTOS
=
itemService
.
batchQuerySpuInfo
(
BatchQuerySpuInfoParam
.
builder
().
ids
(
itemIds
)
List
<
SpuTO
>
spuTOS
=
itemService
.
batchQuerySpuInfo
(
BatchQuerySpuInfoParam
.
builder
().
ids
(
itemIds
)
.
commonProps
(
new
ArrayList
<>()).
spuProps
(
Arrays
.
asList
(
"itemSetupType"
,
"
businessForm
"
)).
build
());
.
commonProps
(
new
ArrayList
<>()).
spuProps
(
Arrays
.
asList
(
"itemSetupType"
,
"
+
"
)).
build
());
log
.
debug
(
"[detail] spuTOS:{}"
,
JSON
.
toJSONString
(
spuTOS
));
log
.
debug
(
"[detail] spuTOS:{}"
,
JSON
.
toJSONString
(
spuTOS
));
// 批量查询物理类目
// 批量查询物理类目
Map
<
Long
,
List
<
SimplePhyCateGoryResultCo
>>
categoryChain
=
itemService
Map
<
Long
,
List
<
SimplePhyCateGoryResultCo
>>
categoryChain
=
itemService
...
...
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowExecServiceImpl.java
View file @
da06f085
...
@@ -34,7 +34,7 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
...
@@ -34,7 +34,7 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
List
<
ChangeExecRecord
>
changeExecRecords
=
changeExecRecordMapper
.
selectByChangeRecordId
(
changeRecordId
);
List
<
ChangeExecRecord
>
changeExecRecords
=
changeExecRecordMapper
.
selectByChangeRecordId
(
changeRecordId
);
if
(
CollectionUtils
.
isNotEmpty
(
changeExecRecords
))
{
if
(
CollectionUtils
.
isNotEmpty
(
changeExecRecords
))
{
return
changeExecRecords
.
stream
()
return
changeExecRecords
.
stream
()
.
map
(
c
->
ChangeFlowExecVO
.
builder
().
changeRecordId
(
c
.
getChangeRecordId
())
.
map
(
c
->
ChangeFlowExecVO
.
builder
().
change
ExecId
(
c
.
getId
()).
change
RecordId
(
c
.
getChangeRecordId
())
.
changeExecDepartment
(
c
.
getChangeExecDepartment
()).
changeExecUserType
(
c
.
getChangeExecUserType
())
.
changeExecDepartment
(
c
.
getChangeExecDepartment
()).
changeExecUserType
(
c
.
getChangeExecUserType
())
.
changeExecUser
(
c
.
getChangeExecUser
()).
changeExecUserEmail
(
c
.
getChangeExecUserEmail
())
.
changeExecUser
(
c
.
getChangeExecUser
()).
changeExecUserEmail
(
c
.
getChangeExecUserEmail
())
.
changeRiskDesc
(
c
.
getChangeRiskDesc
()).
changeExecProject
(
c
.
getChangeExecProject
())
.
changeRiskDesc
(
c
.
getChangeRiskDesc
()).
changeExecProject
(
c
.
getChangeExecProject
())
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeExecConfigReq.java
View file @
da06f085
...
@@ -17,6 +17,10 @@ import lombok.Data;
...
@@ -17,6 +17,10 @@ import lombok.Data;
*/
*/
@Data
@Data
public
class
ChangeExecConfigReq
{
public
class
ChangeExecConfigReq
{
/**
* 变更行动项记录id
*/
private
Long
changeExecId
;
/**
/**
* 变更类型配置记录id
* 变更类型配置记录id
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowExecVO.java
View file @
da06f085
...
@@ -20,6 +20,11 @@ import lombok.NoArgsConstructor;
...
@@ -20,6 +20,11 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@NoArgsConstructor
@Data
@Data
public
class
ChangeFlowExecVO
{
public
class
ChangeFlowExecVO
{
/**
* 变更行动项记录id
*/
private
Long
changeExecId
;
/**
/**
* 变更记录id
* 变更记录id
*/
*/
...
...
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