diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java index 6e70aee7..536d2d59 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java @@ -8,8 +8,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.collections4.CollectionUtils; -import javax.validation.constraints.NotNull; - /** * @author xudawei@axzo.cn * @version 1.0 @@ -22,11 +20,16 @@ import javax.validation.constraints.NotNull; public class CheckVisaWithVisaIdReq { /** - * 变更单号Id + * 变更单号Id,编辑和详情时传入,与{@code creatFormData}互斥使用 */ - @NotNull(message = "变更签证单据Id不能为空") +// @NotNull(message = "变更签证单据Id不能为空") private Long visaId; + /** + * 创建单据状态下的表单数据,创建时传入,与{@code visaId}互斥使用 + */ + private VisaChangeTempCreateReq creatFormData; + /** * 校验 */ @@ -44,7 +47,15 @@ public class CheckVisaWithVisaIdReq { AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空"); }); } - - + } + + public void check() { + AssertUtil.notNull(this.getCreatFormData().getRelationWorkspaceId(), "关联项目不能为空"); + AssertUtil.notNull(this.getCreatFormData().getType(), "单据类型不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getNo(), "单号不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getTopic(), "主题不能为空"); + AssertUtil.notNull(this.getCreatFormData().getRelationProject(), "关联工程不能为空"); + AssertUtil.notNull(this.getCreatFormData().getHappenTime(), "提出时间不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getReason(), "发生原因不能为空"); } } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index c63e693a..090c2871 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -85,7 +85,7 @@ public class VisaChangeTempCreateReq { /** * 提出时间 */ - @NotNull(message = "请选择提交日期") + @NotNull(message = "请选择提出时间") private Date happenTime; /** diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index f364ccb4..093fc98c 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -226,6 +226,12 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl relations = findByCondition(VisaRelationDto.builder() + .visaId(req.getVisaId()) + .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()) + .content(String.valueOf(req.getOperatorPersonId())) + .build()); + AssertUtil.isEmpty(relations, "不允许重复操作"); ChangeRecordRelation relation = new ChangeRecordRelation(); relation.setVisaId(req.getVisaId()); relation.setVarName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()); @@ -248,6 +254,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl visaUploadFiles = this.buildAttachUploadFile(req.getId()); @@ -1617,7 +1616,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl