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
c2e18c66
Commit
c2e18c66
authored
Dec 19, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:变更负责人查询赋值错误
parent
9f55707a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
131 additions
and
31 deletions
+131
-31
InteriorChangeConfigServiceImpl.java
...nge/biz/service/impl/InteriorChangeConfigServiceImpl.java
+2
-2
ChangeFlowExcelVo.java
...l/yanxuan/change/integration/excel/ChangeFlowExcelVo.java
+129
-29
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
View file @
c2e18c66
...
@@ -246,8 +246,8 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
...
@@ -246,8 +246,8 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
SupplierUserRsp
supplierUserRsp
=
listAjaxResponse
.
get
(
0
);
SupplierUserRsp
supplierUserRsp
=
listAjaxResponse
.
get
(
0
);
Map
<
String
,
String
>
uid2NameMap
=
supplierUserRsp
.
getUid2NameMap
();
Map
<
String
,
String
>
uid2NameMap
=
supplierUserRsp
.
getUid2NameMap
();
for
(
String
key
:
uid2NameMap
.
keySet
())
{
for
(
String
key
:
uid2NameMap
.
keySet
())
{
rpc
.
setName
(
key
);
rpc
.
setName
(
uid2NameMap
.
get
(
key
)
);
rpc
.
setEmail
(
uid2NameMap
.
get
(
key
)
);
rpc
.
setEmail
(
key
);
}
}
return
rpc
;
return
rpc
;
}
}
...
...
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelVo.java
View file @
c2e18c66
...
@@ -24,72 +24,172 @@ import lombok.Data;
...
@@ -24,72 +24,172 @@ import lombok.Data;
@Data
@Data
public
class
ChangeFlowExcelVo
{
public
class
ChangeFlowExcelVo
{
/**
/**
*
主键
id
*
变更
id
*/
*/
@ExcelTitleName
(
title
=
"主键id"
,
order
=
1
)
@ExcelTitleName
(
title
=
"变更id"
,
order
=
1
)
private
Long
id
;
private
Long
flowId
;
/**
* 变更发起时间
*/
@ExcelTitleName
(
title
=
"变更发起时间"
,
order
=
2
)
private
String
createTime
;
/**
* 变更发起人
*/
@ExcelTitleName
(
title
=
"变更发起人"
,
order
=
3
)
private
String
changeCreator
;
/**
/**
* 变更主体
* 变更主体
* @see ChangeSubjectEnum
* @see ChangeSubjectEnum
*/
*/
@ExcelTitleName
(
title
=
"变更主体"
,
order
=
2
)
@ExcelTitleName
(
title
=
"变更主体"
,
order
=
4
)
private
String
changeSubject
;
private
String
changeSubject
;
/**
/**
* 变更类型,一级类型>二级类型
* 变更类型,一级类型>二级类型
*/
*/
@ExcelTitleName
(
title
=
"变更类型"
,
order
=
3
)
@ExcelTitleName
(
title
=
"变更类型"
,
order
=
5
)
private
String
changeType
;
private
String
changeType
;
/**
/**
* 变更等级
*/
@ExcelTitleName
(
title
=
"变更等级"
,
order
=
6
)
private
String
changeLevel
;
/**
* 变更负责部门名
* 变更负责部门名
*/
*/
@ExcelTitleName
(
title
=
"变更负责部门名"
,
order
=
4
)
@ExcelTitleName
(
title
=
"变更负责部门名"
,
order
=
7
)
private
String
changeDepartment
;
private
String
changeDepartment
;
/**
/**
* 变更负责人
*/
@ExcelTitleName
(
title
=
"变更负责人"
,
order
=
8
)
private
String
changeCommander
;
/**
* 变更供应商:供应商ID+供应商名称
*/
@ExcelTitleName
(
title
=
"变更供应商"
,
order
=
9
)
private
String
supplier
;
/**
* 变更原因
*/
@ExcelTitleName
(
title
=
"变更原因"
,
order
=
10
)
private
String
changeReason
;
/**
* 变更内容
* 变更内容
*/
*/
@ExcelTitleName
(
title
=
"变更内容"
,
order
=
5
)
@ExcelTitleName
(
title
=
"变更内容"
,
order
=
11
)
private
String
changeContent
;
private
String
changeContent
;
/**
/**
* 变更
负责人
* 变更
潜在风险描述
*/
*/
@ExcelTitleName
(
title
=
"变更
负责人"
,
order
=
6
)
@ExcelTitleName
(
title
=
"变更
潜在风险描述"
,
order
=
12
)
private
String
change
Commander
;
private
String
change
RiskDesc
;
/**
/**
* 变更
商品列表,SPUID+商品名称
* 变更
收益类型
*/
*/
@ExcelTitleName
(
title
=
"变更商品列表"
,
order
=
7
)
@ExcelTitleName
(
title
=
"变更收益类型"
,
order
=
13
)
private
String
changeItems
;
private
Integer
changeProfit
;
/**
/**
* 变更
供应商,仅展示供应商ID,没有时展示为“/”
* 变更
收益说明
*/
*/
@ExcelTitleName
(
title
=
"变更供应商"
,
order
=
8
)
@ExcelTitleName
(
title
=
"变更收益说明"
,
order
=
14
)
private
String
supplier
;
private
String
changeProfitDesc
;
/**
/**
* 变更状态
* 变更商品,商品名称
* @see ChangeStatusEnum
*/
*/
@ExcelTitleName
(
title
=
"变更状态"
,
order
=
9
)
@ExcelTitleName
(
title
=
"变更商品"
,
order
=
15
)
private
Integer
changeState
;
private
String
changeItem
;
/**
/**
*
变更发起人
*
SPUID
*/
*/
@ExcelTitleName
(
title
=
"变更发起人"
,
order
=
10
)
@ExcelTitleName
(
title
=
"SPUID"
,
order
=
16
)
private
String
changeCreator
;
private
String
SPUId
;
/**
* 品控类目
*/
@ExcelTitleName
(
title
=
"品控类目"
,
order
=
17
)
private
String
qcCategory
;
/**
* 物理类目
*/
@ExcelTitleName
(
title
=
"物理类目"
,
order
=
18
)
private
String
phyCategory
;
/**
* 商品立项类型,0-正常立项商品,2-特殊免立项商品 3-组合装
*/
@ExcelTitleName
(
title
=
"商品立项类型"
,
order
=
19
)
private
Integer
itemSetupType
;
/**
/**
*
变更行动部门列表
*
经营形式,0-自营,3-严选贴牌代销,4-他方品牌代销,5-代销2.0
*/
*/
@ExcelTitleName
(
title
=
"
变更行动部门列表"
,
order
=
11
)
@ExcelTitleName
(
title
=
"
经营形式"
,
order
=
20
)
private
String
execDepartmentStrList
;
private
Integer
businessForm
;
/**
/**
*
创建时间
*
商品状态,0-未上架,1-未上架,2-已上架,4-预上架
*/
*/
@ExcelTitleName
(
title
=
"创建时间"
,
order
=
12
)
@ExcelTitleName
(
title
=
"商品状态"
,
order
=
21
)
private
Long
createTime
;
private
String
status
;
/**
* 商品负责人
*/
@ExcelTitleName
(
title
=
"商品负责人"
,
order
=
22
)
private
String
functionary
;
/**
* 采购负责人
*/
@ExcelTitleName
(
title
=
"采购负责人"
,
order
=
23
)
private
String
purchase
;
/**
* SQE负责人
*/
@ExcelTitleName
(
title
=
"SQE负责人"
,
order
=
24
)
private
String
goodsSqe
;
/**
* 计划负责人
*/
@ExcelTitleName
(
title
=
"计划负责人"
,
order
=
25
)
private
String
goodsProjectName
;
/**
* 变更行动部门
*/
@ExcelTitleName
(
title
=
"变更行动部门"
,
order
=
26
)
private
String
execDepartment
;
/**
* 变更行动人
*/
@ExcelTitleName
(
title
=
"变更行动人"
,
order
=
27
)
private
String
changeExecUser
;
/**
* 变更状态
* @see ChangeStatusEnum
*/
@ExcelTitleName
(
title
=
"变更状态"
,
order
=
9
)
private
Integer
changeState
;
public
static
List
<
ExcelCell
>
init
(
ChangeFlowExcelDTO
dto
)
{
public
static
List
<
ExcelCell
>
init
(
ChangeFlowExcelDTO
dto
)
{
List
<
ExcelCell
>
cellInfo
=
new
ArrayList
<>();
List
<
ExcelCell
>
cellInfo
=
new
ArrayList
<>();
...
...
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