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
76836184
Commit
76836184
authored
Dec 06, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 统一字段
parent
f05bf9e3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+3
-3
InteriorChangeConfigServiceImpl.java
...nge/biz/service/impl/InteriorChangeConfigServiceImpl.java
+2
-8
ChangeFlowVO.java
...e/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.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 @
76836184
...
@@ -246,7 +246,7 @@ public class ChangeFlowBiz {
...
@@ -246,7 +246,7 @@ public class ChangeFlowBiz {
changeExecRecord
.
setChangeExecUserType
(
c
.
getChangeExecUserType
());
changeExecRecord
.
setChangeExecUserType
(
c
.
getChangeExecUserType
());
changeExecRecord
.
setChangeExecUser
(
c
.
getChangeExecUser
());
changeExecRecord
.
setChangeExecUser
(
c
.
getChangeExecUser
());
// 查询对应的负责人
// 查询对应的负责人
// interiorChangeConfigService.queryCommanderInfo
(c.getChangeExecUserType(), c.getChangeExecUser(), uid);
interiorChangeConfigService
.
queryCommanderEmail
(
c
.
getChangeExecUserType
(),
c
.
getChangeExecUser
(),
uid
);
changeExecRecord
.
setChangeRiskDesc
(
c
.
getChangeRiskDesc
());
changeExecRecord
.
setChangeRiskDesc
(
c
.
getChangeRiskDesc
());
changeExecRecord
.
setChangeExecProject
(
c
.
getChangeExecProject
());
changeExecRecord
.
setChangeExecProject
(
c
.
getChangeExecProject
());
changeExecRecord
.
setChangeChecking
(
c
.
getChangeChecking
());
changeExecRecord
.
setChangeChecking
(
c
.
getChangeChecking
());
...
@@ -597,7 +597,7 @@ public class ChangeFlowBiz {
...
@@ -597,7 +597,7 @@ public class ChangeFlowBiz {
changeFlowVO
.
setChangeLevel
(
changeRecord
.
getChangeLevel
());
changeFlowVO
.
setChangeLevel
(
changeRecord
.
getChangeLevel
());
changeFlowVO
.
setChangeDepartment
(
changeRecord
.
getChangeDepartment
());
changeFlowVO
.
setChangeDepartment
(
changeRecord
.
getChangeDepartment
());
changeFlowVO
.
setChangeCommander
(
changeRecord
.
getChangeCommander
());
changeFlowVO
.
setChangeCommander
(
changeRecord
.
getChangeCommander
());
changeFlowVO
.
setSupplier
(
changeRecord
.
getChangeSupplier
());
changeFlowVO
.
set
Change
Supplier
(
changeRecord
.
getChangeSupplier
());
changeFlowVO
.
setChangeReason
(
changeRecord
.
getChangeReason
());
changeFlowVO
.
setChangeReason
(
changeRecord
.
getChangeReason
());
changeFlowVO
.
setChangeContent
(
changeRecord
.
getChangeContent
());
changeFlowVO
.
setChangeContent
(
changeRecord
.
getChangeContent
());
changeFlowVO
.
setChangeRiskDesc
(
changeRecord
.
getChangeRiskDesc
());
changeFlowVO
.
setChangeRiskDesc
(
changeRecord
.
getChangeRiskDesc
());
...
@@ -696,7 +696,7 @@ public class ChangeFlowBiz {
...
@@ -696,7 +696,7 @@ public class ChangeFlowBiz {
if
(
StringUtils
.
isNotBlank
(
itemJsonStr
))
{
if
(
StringUtils
.
isNotBlank
(
itemJsonStr
))
{
changeFlowVO
.
setChangeItems
(
JSON
.
parseArray
(
itemJsonStr
,
ItemVO
.
class
));
changeFlowVO
.
setChangeItems
(
JSON
.
parseArray
(
itemJsonStr
,
ItemVO
.
class
));
}
}
changeFlowVO
.
setSupplier
(
c
.
getChangeSupplier
());
changeFlowVO
.
set
Change
Supplier
(
c
.
getChangeSupplier
());
changeFlowVO
.
setChangeState
(
c
.
getState
());
changeFlowVO
.
setChangeState
(
c
.
getState
());
changeFlowVO
.
setChangeCreator
(
c
.
getCreator
());
changeFlowVO
.
setChangeCreator
(
c
.
getCreator
());
String
participateChangeExecDepartment
=
c
.
getParticipateChangeExecDepartment
();
String
participateChangeExecDepartment
=
c
.
getParticipateChangeExecDepartment
();
...
...
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
View file @
76836184
...
@@ -6,6 +6,7 @@ import java.util.Iterator;
...
@@ -6,6 +6,7 @@ import java.util.Iterator;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -34,13 +35,6 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier
...
@@ -34,13 +35,6 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier
import
com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp
;
import
com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse
;
import
com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.*
;
/**
/**
* @author WangJiaXiang
* @author WangJiaXiang
...
@@ -284,7 +278,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
...
@@ -284,7 +278,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
commanderResponse
.
setEmail
(
changeExecUser
);
commanderResponse
.
setEmail
(
changeExecUser
);
break
;
break
;
case
GOODS_ASSOCIATED:
case
GOODS_ASSOCIATED:
// queryGoodsCommander()
}
}
return
null
;
return
null
;
}
}
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.java
View file @
76836184
...
@@ -108,7 +108,7 @@ public class ChangeFlowVO {
...
@@ -108,7 +108,7 @@ public class ChangeFlowVO {
/**
/**
* 变更供应商
* 变更供应商
*/
*/
private
String
s
upplier
;
private
String
changeS
upplier
;
/**
/**
* 变更状态
* 变更状态
* @see ChangeStatusEnum
* @see ChangeStatusEnum
...
...
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