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

Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581

Browse Source
This commit is contained in:
yanglin 2025-02-26 15:00:23 +08:00
commit 366b14ea1b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
View File

@ -668,6 +668,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
create.setStartFormVariables(visaHelper.buildStartFormVariables(createReq)); create.setStartFormVariables(visaHelper.buildStartFormVariables(createReq));
create.setVariables(Maps.of( create.setVariables(Maps.of(
IM_GROUP_BIZ_INFO_VISA_ID, visa.getId(),
WORKFLOW_VAR_STAMP_OU_ID, model.getOuId(), WORKFLOW_VAR_STAMP_OU_ID, model.getOuId(),
WORKFLOW_VAR_STAMP_TYPE, model.getSealType().name(), WORKFLOW_VAR_STAMP_TYPE, model.getSealType().name(),
WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), "") WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), "")

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

@ -1850,6 +1850,11 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
result.setStampStatus(oldValue.nextStampStatus(req.getVisaStampAction())); result.setStampStatus(oldValue.nextStampStatus(req.getVisaStampAction()));
} }
// 取消用印默认把合同id清空掉，后续如果有多种case，可以默认就清空，使用流程编排重构进行扩展
if (Objects.equals(req.getVisaStampAction(), CANCEL)) {
result.setContractId("");
}
return result; return result;
} }