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 10:42:44 +08:00
parent 3b8acc5e2c
commit 3c2c4ab54d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,6 +601,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
/*编辑*/ /*编辑*/
changeRecord = getById(req.getId()); changeRecord = getById(req.getId());
AssertUtil.notNull(changeRecord, "记录不存在"); AssertUtil.notNull(changeRecord, "记录不存在");
if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
// 编辑态下校验单据状态
AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
|| (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
"当前单据审批中，不允许操作");
}
oldContext = new VisaAddLogContext(); oldContext = new VisaAddLogContext();
oldContext.setStatus(changeRecord.getStatus()); oldContext.setStatus(changeRecord.getStatus());
@ -762,14 +768,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Long approveCreateVisaChangeRecord(VisaChangeApproveCreateReq req) { public Long approveCreateVisaChangeRecord(VisaChangeApproveCreateReq req) {
/*校验*/ /*校验*/
ChangeRecord changeRecord = this.getById(req.getId());
if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
// 编辑态下校验单据状态
AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
|| (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
"当前单据审批中，不允许操作");
}
validVisaChangeForm(req); validVisaChangeForm(req);
ChangeRecord changeRecord = this.getById(req.getId());
ChangeRecord oldChangeRecord = BeanUtil.copyProperties(changeRecord, ChangeRecord.class); ChangeRecord oldChangeRecord = BeanUtil.copyProperties(changeRecord, ChangeRecord.class);
List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles = this.buildAttachUploadFile(req.getId()); List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles = this.buildAttachUploadFile(req.getId());