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
e686711e
Commit
e686711e
authored
Dec 28, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 引用工单返回供应商名称
parent
b84da93f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+15
-5
BasicChangeFlowVO.java
...l/yanxuan/change/dal/meta/model/vo/BasicChangeFlowVO.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 @
e686711e
...
...
@@ -934,14 +934,24 @@ public class ChangeFlowBiz {
if
(
CreateSourceEnum
.
TONG_ZHOU
.
getType
().
equals
(
createSource
))
{
Assert
.
isTrue
(
changeRecord
.
getCreateSupplier
().
equals
(
supplier
),
"不能引用非本供应商工单"
);
}
String
changeSupplier
=
changeRecord
.
getChangeSupplier
();
String
changeSupplierName
=
""
;
if
(
StringUtils
.
isNotBlank
(
changeSupplier
))
{
List
<
SupplierSimpleRsp
>
supplierSimple
=
supplierService
.
getSupplierName
(
changeSupplier
);
if
(
CollectionUtils
.
isNotEmpty
(
supplierSimple
))
{
SupplierSimpleRsp
supplierInfo
=
supplierSimple
.
get
(
0
);
changeSupplierName
=
supplierInfo
.
getSupplierName
();
}
}
// 获取附件
List
<
ChangeFlowFile
>
changeFileList
=
changeFileService
.
getChangeFileList
(
changeRecord
.
getId
());
return
BasicChangeFlowVO
.
builder
().
parentChangeClassId
(
changeRecord
.
getParentChangeClassId
())
.
sonChangeClassId
(
changeRecord
.
getSonChangeClassId
()).
changeSubject
(
changeRecord
.
getChangeSubject
())
.
changeItem
(
changeRecord
.
getChangeItem
()).
changeSupplier
(
changeRecord
.
getChangeSupplier
())
.
changeReason
(
changeRecord
.
getChangeReason
()).
changeContent
(
changeRecord
.
getChangeContent
())
.
changeRiskDesc
(
changeRecord
.
getChangeRiskDesc
()).
changeProfit
(
changeRecord
.
getChangeProfit
())
.
changeProfitDesc
(
changeRecord
.
getChangeProfitDesc
()).
files
(
changeFileList
).
build
();
.
sonChangeClassId
(
changeRecord
.
getSonChangeClassId
()).
changeSubject
(
changeRecord
.
getChangeSubject
())
.
changeItem
(
changeRecord
.
getChangeItem
()).
changeSupplier
(
changeSupplier
)
.
changeSupplierName
(
changeSupplierName
).
changeReason
(
changeRecord
.
getChangeReason
())
.
changeContent
(
changeRecord
.
getChangeContent
()).
changeRiskDesc
(
changeRecord
.
getChangeRiskDesc
())
.
changeProfit
(
changeRecord
.
getChangeProfit
()).
changeProfitDesc
(
changeRecord
.
getChangeProfitDesc
())
.
files
(
changeFileList
).
build
();
}
public
ChangeFlowVO
detail
(
Long
flowId
)
{
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/BasicChangeFlowVO.java
View file @
e686711e
...
...
@@ -52,6 +52,11 @@ public class BasicChangeFlowVO {
private
String
changeSupplier
;
/**
* 变更供应商详情展示,供应商名称
*/
private
String
changeSupplierName
;
/**
* 变更原因
*/
private
String
changeReason
;
...
...
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