waring
parent
4618274961
commit
e6542e7c5f
|
|
@ -35,11 +35,11 @@ public class EvalInternalReviewController {
|
|||
return evalInternalReviewApi.confirm(cmd);
|
||||
}
|
||||
|
||||
/*@ApiOperation("下发签字任务")
|
||||
@ApiOperation("下发签字任务")
|
||||
@PostMapping("/assign")
|
||||
public SingleResponse<Void> assign(@Validated @RequestBody EvalInternalReviewAssignCmd cmd) {
|
||||
return evalInternalReviewApi.assign(cmd);
|
||||
}*/
|
||||
}
|
||||
|
||||
/*@ApiOperation("按项目查询")
|
||||
@GetMapping("/get")
|
||||
|
|
|
|||
|
|
@ -15,26 +15,25 @@ public class EvalInternalReviewCO {
|
|||
|
||||
@ApiModelProperty("项目id")
|
||||
private String projectId;
|
||||
@ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
|
||||
private Integer statusCode;
|
||||
@ApiModelProperty(value = "节点状态名称：未开始/进行中/已完成/退回", example = "进行中")
|
||||
private String statusName;
|
||||
@ApiModelProperty("草稿id")
|
||||
private String draftId;
|
||||
|
||||
@ApiModelProperty("内审人员id")
|
||||
private String reviewerPersonnelId;
|
||||
|
||||
@ApiModelProperty("内审人员名称")
|
||||
private String reviewerName;
|
||||
|
||||
@ApiModelProperty(value = "内审人独立签字")
|
||||
private String reviewerSignatureUrl;
|
||||
|
||||
@ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
|
||||
private String reviewerSignatureTaskStatus;
|
||||
|
||||
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
|
||||
private String resultCode;
|
||||
@ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过")
|
||||
private String resultName;
|
||||
|
||||
@ApiModelProperty("审核意见内容")
|
||||
private String opinionContent;
|
||||
|
||||
@ApiModelProperty("审核时间")
|
||||
private LocalDateTime reviewTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,29 +2,13 @@ package org.qinan.safetyeval.client.dto.institution;
|
|||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.qinan.safetyeval.client.item.request.EvalReviewItemAddCmd;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class EvalInternalReviewAssignCmd {
|
||||
|
||||
@ApiModelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("项目id")
|
||||
private Long projectId;
|
||||
|
||||
@ApiModelProperty(value = "内审人人员id")
|
||||
private String reviewerPersonnelId;
|
||||
|
||||
@ApiModelProperty(value = "内审人姓名", example = "2")
|
||||
private String reviewerName;
|
||||
|
||||
@ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
|
||||
@ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched", hidden = true)
|
||||
private String reviewerSignatureTaskStatus;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,15 +22,6 @@ public class EvalInternalReviewConfirmCmd {
|
|||
@ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
|
||||
private Integer statusCode;
|
||||
|
||||
@ApiModelProperty(value = "内审人人员id")
|
||||
private Long reviewerPersonnelId;
|
||||
|
||||
@ApiModelProperty(value = "内审人姓名", example = "2")
|
||||
private String reviewerName;
|
||||
|
||||
@ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
|
||||
private String reviewerSignatureTaskStatus;
|
||||
|
||||
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
|
||||
private String resultCode;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package org.qinan.safetyeval.client.item.response;
|
||||
|
||||
import com.alibaba.cola.dto.ClientObject;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
|
@ -12,8 +11,8 @@ import lombok.Data;
|
|||
* @date 2026-07-21 11:54:47
|
||||
*/
|
||||
@Data
|
||||
public class EvalReviewItemCo extends ClientObject {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class EvalReviewItemCo {
|
||||
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private Long id;
|
||||
/**
|
||||
|
|
@ -51,11 +50,4 @@ public class EvalReviewItemCo extends ClientObject {
|
|||
*/
|
||||
@ApiModelProperty(value = "审核意见")
|
||||
private String reviewOpinion;
|
||||
/**
|
||||
* 环境
|
||||
*/
|
||||
@ApiModelProperty(value = "环境")
|
||||
private String env;
|
||||
@ApiModelProperty(value = "version")
|
||||
private Integer version;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.qinan.safetyeval.infrastructure.persistence.domainobject;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.jjb.saas.framework.repository.basedo.BaseDO;
|
||||
import lombok.Data;
|
||||
|
|
@ -49,4 +50,10 @@ public class EvalReviewItemDO extends BaseDO {
|
|||
* 环境
|
||||
*/
|
||||
private String env;
|
||||
|
||||
@TableLogic(
|
||||
value = "false",
|
||||
delval = "true"
|
||||
)
|
||||
protected String deleteEnum;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue