Commit 5d723e41 by 王志超

feat: 变更工单列表枚举更新

parent db4d7cd1
......@@ -1147,6 +1147,7 @@ public class ChangeFlowBiz {
changeFlowVO.setItemBasicInfoList(null);
}
changeFlowVO.setChangeState(changeRecord.getState());
changeFlowVO.setChangeStateDesc(ChangeStatusEnum.getDescByStatus(changeRecord.getState()));
changeFlowVO.setChangeCreator(changeRecord.getCreator());
List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId());
try {
......@@ -1290,7 +1291,9 @@ public class ChangeFlowBiz {
changeFlowVO.setChangeItems(itemVOS);
}
changeFlowVO.setChangeSupplier(c.getChangeSupplier());
changeFlowVO.setChangeState(c.getState() == 3 ? ChangeStatusEnum.IN.getStatus() : c.getState());
Integer changeState = c.getState() == 3 ? ChangeStatusEnum.IN.getStatus() : c.getState();
changeFlowVO.setChangeState(changeState);
changeFlowVO.setChangeStateDesc(ChangeStatusEnum.getDescByStatus(changeState));
// 同舟端展示供应商id
changeFlowVO.setChangeCreator(
CreateSourceEnum.TONG_ZHOU.getType().equals(c.getCreateSource()) ? c.getCreateSupplier()
......
......@@ -6,6 +6,9 @@
*/
package com.netease.mail.yanxuan.change.common.enums;
import java.util.Arrays;
import java.util.Objects;
/**
* @Author zcwang
* @Date 2022/11/14
......@@ -15,7 +18,17 @@ public enum ChangeStatusEnum {
CANCEL(2, "取消完结"),
DELAY(3, "延期"),
END(4, "完结"),
WAIT(5, "待发起");
WAIT(5, "待发起"),
WAIT_SUBMIT_CHANGE_APPLY(6, "待提交变更申请"),
WAIT_CONFIRM_CHANGE_PLAN(7, "待确认变更方案"),
WAIT_DEPT_LEADER_APPROVE(8, "待部门负责人审批"),
WAIT_CHANGE_ADMIN_APPROVE(9, "待变更管理员审批"),
WAIT_QUALITY_LEADER_APPROVE(10, "待质量部负责人审批"),
WAIT_EXEC_CHANGE_PLAN(11, "待执行变更方案"),
WAIT_CONFIRM_EXEC_RESULT(12, "待确认执行结果"),
FINISHED(13, "已完结"),
CANCELLED(14, "已取消");
private Integer status;
......@@ -33,4 +46,20 @@ public enum ChangeStatusEnum {
public String getDesc() {
return desc;
}
/**
* 根据状态码获取描述
* @param status 状态码
* @return 状态描述
*/
public static String getDescByStatus(Integer status) {
if (status == null) {
return null;
}
return Arrays.stream(ChangeStatusEnum.values())
.filter(e -> Objects.equals(e.getStatus(), status))
.map(ChangeStatusEnum::getDesc)
.findFirst()
.orElse(null);
}
}
\ No newline at end of file
......@@ -127,6 +127,12 @@ public class ChangeFlowVO {
* @see ChangeStatusEnum
*/
private Integer changeState;
/**
* 变更状态描述
*/
private String changeStateDesc;
/**
* 变更发起人
*/
......
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