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

REQ-3982: fix bugs

Browse Source
This commit is contained in:
yanglin 2025-04-29 16:23:56 +08:00
parent 9fb4a349d6
commit 9dec6904ef
2 changed files with 185 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
nanopart-server/src/test/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandlerTest.java
View File

File diff suppressed because one or more lines are too long

7
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandler.java
View File

@ -15,7 +15,6 @@ import cn.axzo.framework.rocketmq.Event;
import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventConsumer;
import cn.axzo.nanopart.visa.api.enums.VisaProcessPhase; import cn.axzo.nanopart.visa.api.enums.VisaProcessPhase;
import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum;
import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum;
import cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq; import cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq;
import cn.axzo.nanopart.visa.server.config.RefreshableConfiguration; import cn.axzo.nanopart.visa.server.config.RefreshableConfiguration;
import cn.axzo.nanopart.visa.server.domain.ChangeRecord; import cn.axzo.nanopart.visa.server.domain.ChangeRecord;
@ -117,12 +116,6 @@ public class CompleteVisaChangeStampHandler implements ProcessInstanceEventHandl
.allMatch(e -> e.getValue().stream() .allMatch(e -> e.getValue().stream()
.anyMatch(relation -> Objects.equals(result.getStatus(), relation.getContentExt()))); .anyMatch(relation -> Objects.equals(result.getStatus(), relation.getContentExt())));
if (approvedOrRejected) { if (approvedOrRejected) {
// 有可能用户在界面手动完成用印， 这里就无法自动完成
if (Objects.isNull(changeRecord) || !Objects.equals(phase == VisaProcessPhase.PROJECT ? changeRecord.getStampStatus() : changeRecord.getStampStatusPay(), VisaStampStatusEnum.WITH_PRINT)) {
log.info("CompleteVisaChangeStampHandler changeRecord stampStatus not withPrint");
return;
}
boolean approved = result == BpmnProcessInstanceResultEnum.APPROVED; boolean approved = result == BpmnProcessInstanceResultEnum.APPROVED;
changeRecordService.update(UpdateVisaChangeReq.builder() changeRecordService.update(UpdateVisaChangeReq.builder()
.visaId(visaId) .visaId(visaId)