Commit 7863360b by “zcwang”

modify: 提交工单

parent dcf0c65c
...@@ -30,4 +30,6 @@ public interface ChangeFlowExecService { ...@@ -30,4 +30,6 @@ public interface ChangeFlowExecService {
* @param changeExecRecordList * @param changeExecRecordList
*/ */
void batchSaveRecord(List<ChangeExecRecord> changeExecRecordList); void batchSaveRecord(List<ChangeExecRecord> changeExecRecordList);
Boolean update(ChangeExecRecord exec);
} }
\ No newline at end of file
...@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service; ...@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService; import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService;
import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord; import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord;
import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecRecordMapper; import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecRecordMapper;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecConfigReq;
import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO; import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
/** /**
...@@ -49,4 +48,9 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService { ...@@ -49,4 +48,9 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
public void batchSaveRecord(List<ChangeExecRecord> changeExecRecordList) { public void batchSaveRecord(List<ChangeExecRecord> changeExecRecordList) {
changeExecRecordMapper.insertList(changeExecRecordList); changeExecRecordMapper.insertList(changeExecRecordList);
} }
@Override
public Boolean update(ChangeExecRecord changeExecRecord) {
return changeExecRecordMapper.updateByPrimaryKeySelective(changeExecRecord) > 0;
}
} }
\ No newline at end of file
...@@ -33,4 +33,13 @@ public enum ChangeFlowEnum { ...@@ -33,4 +33,13 @@ public enum ChangeFlowEnum {
this.name = name; this.name = name;
this.topoId = topoId; this.topoId = topoId;
} }
public static ChangeFlowEnum getByNodeId(String nodeId) {
for (ChangeFlowEnum value : ChangeFlowEnum.values()) {
if (value.getNodeId().equals(nodeId)) {
return value;
}
}
return null;
}
} }
\ No newline at end of file
...@@ -12,7 +12,6 @@ package com.netease.mail.yanxuan.change.common.enums; ...@@ -12,7 +12,6 @@ package com.netease.mail.yanxuan.change.common.enums;
*/ */
public enum ChangeResultEnum { public enum ChangeResultEnum {
INIT(0, "初始化"),
FINISH_ALL(1, "完成变更管理,风险可控,可实施变更"), FINISH_ALL(1, "完成变更管理,风险可控,可实施变更"),
FINISH_PART(2, "完成变更管理,部分风险不可控,待修订变更方案"), FINISH_PART(2, "完成变更管理,部分风险不可控,待修订变更方案"),
CANCEL(3, "不通过,变更取消"), CANCEL(3, "不通过,变更取消"),
...@@ -25,6 +24,14 @@ public enum ChangeResultEnum { ...@@ -25,6 +24,14 @@ public enum ChangeResultEnum {
this.status = status; this.status = status;
this.desc = desc; this.desc = desc;
} }
public static ChangeResultEnum getByStatus(Integer status) {
for (ChangeResultEnum value : ChangeResultEnum.values()) {
if (value.getStatus().equals(status)) {
return value;
}
}
return null;
}
public Integer getStatus() { public Integer getStatus() {
return status; return status;
......
...@@ -42,4 +42,14 @@ public class ChangeExecProject { ...@@ -42,4 +42,14 @@ public class ChangeExecProject {
* 变更验证措施 * 变更验证措施
*/ */
private String changeChecking; private String changeChecking;
/**
* 行动完成时间
*/
private Long changeExecFinishTime;
/**
* 行动完成情况
*/
private String changeExecFinishDesc;
} }
\ No newline at end of file
...@@ -36,11 +36,11 @@ public class ChangeFlowSubmitReq { ...@@ -36,11 +36,11 @@ public class ChangeFlowSubmitReq {
/** /**
* 一级类型id * 一级类型id
*/ */
private int parentChangeClassId; private Long parentChangeClassId;
/** /**
* 二级类型id * 二级类型id
*/ */
private int sonChangeClassId; private Long sonChangeClassId;
/** /**
* 变更商品 * 变更商品
*/ */
...@@ -90,11 +90,11 @@ public class ChangeFlowSubmitReq { ...@@ -90,11 +90,11 @@ public class ChangeFlowSubmitReq {
/** /**
* 变更结论 * 变更结论
*/ */
private Long changeResult; private Integer changeResult;
/** /**
* 原因说明(取消时存在) * 取消原因说明(取消时存在)
*/ */
private String changeResultDesc; private String cancelReason;
/** /**
* 备注 * 备注
*/ */
......
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