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
a650dd83
Commit
a650dd83
authored
Dec 20, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:导出完善
parent
630be618
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
4 deletions
+20
-4
ChangeFlowExportCallback.java
...yanxuan/change/biz/callback/ChangeFlowExportCallback.java
+3
-1
ProfitTypeEnum.java
...ease/mail/yanxuan/change/common/enums/ProfitTypeEnum.java
+14
-0
ChangeFlowExcelDTO.java
.../yanxuan/change/integration/excel/ChangeFlowExcelDTO.java
+1
-1
ChangeFlowExcelVo.java
...l/yanxuan/change/integration/excel/ChangeFlowExcelVo.java
+2
-2
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java
View file @
a650dd83
...
...
@@ -39,6 +39,7 @@ import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
import
com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum
;
import
com.netease.mail.yanxuan.change.common.enums.ItemSetupTypeEnum
;
import
com.netease.mail.yanxuan.change.common.enums.MainSpuStatusEnum
;
import
com.netease.mail.yanxuan.change.common.enums.ProfitTypeEnum
;
import
com.netease.mail.yanxuan.change.common.util.DateUtils
;
import
com.netease.mail.yanxuan.change.common.util.ExcelUtil
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord
;
...
...
@@ -311,7 +312,8 @@ public class ChangeFlowExportCallback implements DesCallbackService {
changeFlowExcelDTO
.
setChangeReason
(
record
.
getChangeReason
());
changeFlowExcelDTO
.
setChangeContent
(
record
.
getChangeContent
());
changeFlowExcelDTO
.
setChangeRiskDesc
(
record
.
getChangeRiskDesc
());
changeFlowExcelDTO
.
setChangeProfit
(
record
.
getChangeProfit
());
// todo:变更收益类型和前端核对枚举
changeFlowExcelDTO
.
setChangeProfit
(
ProfitTypeEnum
.
getByType
(
record
.
getChangeProfit
()));
changeFlowExcelDTO
.
setChangeProfitDesc
(
record
.
getChangeProfitDesc
());
return
changeFlowExcelDTO
;
}
...
...
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ProfitTypeEnum.java
View file @
a650dd83
...
...
@@ -30,4 +30,17 @@ public enum ProfitTypeEnum {
public
Integer
getType
()
{
return
type
;
}
public
String
getDesc
()
{
return
desc
;
}
public
static
String
getByType
(
Integer
type
)
{
for
(
ProfitTypeEnum
value
:
ProfitTypeEnum
.
values
())
{
if
(
value
.
getType
().
equals
(
type
))
{
return
value
.
getDesc
();
}
}
return
""
;
}
}
\ No newline at end of file
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelDTO.java
View file @
a650dd83
...
...
@@ -93,7 +93,7 @@ public class ChangeFlowExcelDTO {
* 变更收益类型
*/
@Excel
(
name
=
"变更收益类型"
)
private
Integer
changeProfit
;
private
String
changeProfit
;
/**
* 变更收益说明
...
...
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelVo.java
View file @
a650dd83
...
...
@@ -99,7 +99,7 @@ public class ChangeFlowExcelVo {
* 变更收益类型
*/
@ExcelTitleName
(
title
=
"变更收益类型"
,
order
=
13
)
private
Integer
changeProfit
;
private
String
changeProfit
;
/**
* 变更收益说明
...
...
@@ -204,7 +204,7 @@ public class ChangeFlowExcelVo {
* 行动完成时间
*/
@ExcelTitleName
(
title
=
"行动完成时间"
,
order
=
31
)
private
Lo
ng
changeExecFinishTime
;
private
Stri
ng
changeExecFinishTime
;
/**
* 行动完成情况
...
...
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