Skip to content

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

modify: 取消变更

parent 1532953a
Showing with 53 additions and 37 deletions
doc/scheme.sql
......@@ -62,8 +62,8 @@ CREATE TABLE `TB_YX_QC_CHANGE_RECORD`
`change_profit` int(11) NOT NULL DEFAULT '0' COMMENT '变更收益',
`change_profit_desc` varchar(550) NOT NULL DEFAULT '' COMMENT '变更收益说明',
`change_confirm_result_time` bigint(20) NOT NULL DEFAULT '0' COMMENT '变更结果确认时间',
`state` int(2) NOT NULL DEFAULT '0' COMMENT '工单状态',
`is_cancel` int(2) NOT NULL DEFAULT '0' COMMENT '是否被取消',
`state` int(2) NOT NULL DEFAULT '0' COMMENT '工单状态,1进行中,2取消完结,3延期,4正常完结',
`cancel_reason` varchar(550) NOT NULL DEFAULT '' COMMENT '取消原因',
`change_result` int(2) NOT NULL DEFAULT '0' COMMENT '变更结论',
`create_source` int(2) NOT NULL DEFAULT '0' COMMENT '创建端（普通or同舟）',
`create_supplier` varchar(20) NOT NULL DEFAULT '' COMMENT '创建人所属供应商（同舟创建）',
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/bean/ResponseCode.java
......@@ -120,30 +120,14 @@ public enum ResponseCode {
NO_GOOD_TASK(802, "不是商品任务"),
//----------10xx-----------
CREATE_FLOW_ERROR(1001, "创建工单错误"),
DETAIL_FLOW_ERROR(1002, "查询工单详情错误"),
SUBMIT_FLOW_ERROR(1002, "提交工单错误"),
ERROR_FLOW_ID(1003, "工单id不存在"),
NODE_ERROR(1004, "工单已流转至其他节点"),
NO_AUTH(1005, "没有当前节点操作权限"),
//----------10xx-----------
NO_DATA(1007, "无数据"),
STEP_NOT_ENOUGH(1008, "步数不足"),
ALREADY_DO(1009, "已完成"),
NOT_FINISH(1011, "未完成"),
FINISH_GUIDE(1012, "完成新手奖励"),
RECEIVE_GUIDE(1013, "完成新手奖励"),
NOT_IN_DMP(1014, "未命中DMP分组"),
NOT_BIND_PHONE(1015, "未绑定手机号"),
/**
* 名字已经被使用
*/
NAME_EXIST(2000, "NAME_IS_USED"),
CHANGE_SUBJECT_ERROR(1006, "变更主体类型错误"),
/**
* 无权限
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeStatusEnum.java
......@@ -13,8 +13,9 @@ package com.netease.mail.yanxuan.change.common.enums;
public enum ChangeStatusEnum {
IN(1, "进行中"),
CANCEL(2, "取消"),
END(3, "完结");
CANCEL(2, "取消完结"),
DELAY(3, "延期"),
END(4, "完结");
private Integer status;
......
yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeSubjectEnum.java
......@@ -34,13 +34,13 @@ public enum ChangeSubjectEnum {
return desc;
}
public static Boolean getByType(Integer type) {
public static ChangeSubjectEnum getByType(Integer type) {
for (ChangeSubjectEnum value : ChangeSubjectEnum.values()) {
if (value.getType().equals(type)) {
return true;
return value;
}
}
return false;
return null;
}
public static ChangeSubjectEnum getChangeSubjectEnum(Integer id){
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeRecord.java
......@@ -128,7 +128,7 @@ public class ChangeRecord {
private Integer state;
/**
* 是否被取消
* 取消原因
*/
private String cancelReason;
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCancelReq.java 0 → 100644
/**
* @(#)ChangeFlowCancelReq.java, 2022/11/21.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package com.netease.mail.yanxuan.change.dal.meta.model.req;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.Data;
/**
* @Author zcwang
* @Date 2022/11/21
*/
@Data
public class ChangeFlowCancelReq {
/**
* 工单id
*/
@NotNull(message = "工单id不能为空")
private Long flowId;
@NotBlank(message = "取消原因不能为空")
@Size(max = 200, message = "取消原因限制200字")
private String cancelReason;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
......@@ -86,8 +86,9 @@ public class ChangeFlowCreateReq {
private List<ChangeFlowFile> files;
/**
* 变更潜在风险
* 变更潜在风险描述
*/
@NotBlank(message = "变更潜在风险描述不能为空")
private String changeRiskDesc;
/**
......
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java
......@@ -6,8 +6,6 @@
*/
package com.netease.mail.yanxuan.change.web.controller;
import java.util.List;
import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,8 +20,9 @@ import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
import lombok.extern.slf4j.Slf4j;
......@@ -71,7 +70,7 @@ public class ChangeFlowController {
}
/**
* 发起变更，自动跳转到第一个节点
* 发起变更，如果发起人=审核人，自动跳转到第一个节点
* @return
*/
@PostMapping("/create")
......@@ -85,8 +84,8 @@ public class ChangeFlowController {
* @return
*/
@PostMapping("/submit")
public AjaxResult<String> submit(@RequestBody @Valid ChangeFlowReq changeFlowReq) {
return AjaxResult.success(changeFlowBiz.submit(changeFlowReq));
public AjaxResult<String> submit(@RequestBody @Valid ChangeFlowSubmitReq changeFlowSubmitReq) {
return AjaxResult.success(changeFlowBiz.submit(changeFlowSubmitReq));
}
/**
......@@ -103,9 +102,8 @@ public class ChangeFlowController {
* @return
*/
@GetMapping("/cancel")
public AjaxResult<Void> cancel() {
return AjaxResult.success();
public AjaxResult<Boolean> cancel(@RequestBody @Valid ChangeFlowCancelReq changeFlowCancelReq) {
return AjaxResult.success(changeFlowBiz.cancel(changeFlowCancelReq));
}
/**
......
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