Skip to content

Y
yanxuan-qc-change-system
Commit c32b55d7 by “zcwang”
Options

modify: 导出字段优化

parent 7f3d65a0
Pipeline #44737 passed with stages
in 1 minute 48 seconds
Showing with 13 additions and 12 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java
......@@ -260,12 +260,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
}
// 组装行动项相关信息
obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
changeFlowExcelDTO.setChangeResult(resultEnum == null ? "": resultEnum.getDesc());
changeFlowExcelDTO
.setChangeEndTime(record.getState().equals(ChangeStatusEnum.END.getStatus())
? DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT)
: "/");
this.obtainOther(record, changeFlowExcelDTO);
changeFlowExcelDTOList.add(changeFlowExcelDTO);
}
}
......@@ -291,12 +286,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
changeFlowExcelDTO.setGoodsProject(null);
// 组装行动项相关信息
this.obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
changeFlowExcelDTO.setChangeResult(resultEnum == null ? "": resultEnum.getDesc());
changeFlowExcelDTO
.setChangeEndTime(record.getState().equals(ChangeStatusEnum.END.getStatus())
? DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT)
: "/");
this.obtainOther(record, changeFlowExcelDTO);
changeFlowExcelDTOList.add(changeFlowExcelDTO);
}
break;
......@@ -307,6 +297,17 @@ public class ChangeFlowExportCallback implements DesCallbackService {
}
private void obtainOther(ChangeRecord record, ChangeFlowExcelDTO changeFlowExcelDTO) {
ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
changeFlowExcelDTO.setChangeResult(resultEnum == null ? "" : resultEnum.getDesc());
if (record.getState().equals(ChangeStatusEnum.CANCEL.getStatus())
|| record.getState().equals(ChangeStatusEnum.END.getStatus())) {
changeFlowExcelDTO.setChangeEndTime(DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT));
} else {
changeFlowExcelDTO.setChangeEndTime("/");
}
}
private void buildGoodsPrincipal(ChangeGoodsPrincipalPO changeGoodsPrincipalPO, ChangeFlowExcelDTO changeFlowExcelDTO) {
String functionaryName = StringUtils.isBlank(changeGoodsPrincipalPO.getFunctionaryName()) ? "" : changeGoodsPrincipalPO.getFunctionaryName();
String functionaryEmail = StringUtils.isBlank(changeGoodsPrincipalPO.getFunctionaryEmail()) ? "" : changeGoodsPrincipalPO.getFunctionaryEmail();
......
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