Commit a650dd83 by “zcwang”

modify:导出完善

parent 630be618
......@@ -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;
}
......
......@@ -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
......@@ -93,7 +93,7 @@ public class ChangeFlowExcelDTO {
* 变更收益类型
*/
@Excel(name = "变更收益类型")
private Integer changeProfit;
private String changeProfit;
/**
* 变更收益说明
......
......@@ -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 Long changeExecFinishTime;
private String changeExecFinishTime;
/**
* 行动完成情况
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment