wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300): 表单校验模型调整

Browse Source
This commit is contained in:
chenwenjian 2025-02-27 16:35:39 +08:00
parent ed0586ce8c
commit b0a8fe2455
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java
View File

@ -47,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(), "发生原因不能为空");
}
}

2
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java
View File

@ -85,7 +85,7 @@ public class VisaChangeTempCreateReq {
/**
* 提出时间
*/
@NotNull(message = "请选择提交日期")
@NotNull(message = "请选择提出时间")
private Date happenTime;
/**

12
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -2009,9 +2009,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
*/
@Override
public void checkVisaWithVisaId(CheckVisaWithVisaIdReq req) {
VisaDetailByIdResponse response = this.detailById(req.getVisaId());
req.check(response);
this.validVisaChangeForm(Objects.requireNonNull(this.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId())));
if (NumberUtil.isPositiveNumber(req.getVisaId())) {
VisaDetailByIdResponse response = this.detailById(req.getVisaId());
AssertUtil.notNull(response, "单据不存在");
req.check(response);
this.validVisaChangeForm(Objects.requireNonNull(this.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId())));
} else {
req.check();
this.validVisaChangeForm(BeanUtil.copyProperties(req.getCreatFormData(), VisaChangeApproveCreateReq.class));
}
}