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-03-06 15:43:50 +08:00
commit 0aa2fcc0bc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import cn.axzo.workflow.starter.handler.ProcessInstanceEventHandler;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -93,8 +94,9 @@ public class ProcessInstanceOfEssAllEventHandler extends BasicLogSupport impleme
log.info("change process instance of ess: {}, instance result: {}", dto.getProcessInstanceId(), dto.getType().getTag()); log.info("change process instance of ess: {}, instance result: {}", dto.getProcessInstanceId(), dto.getType().getTag());
Long visaId = Long.valueOf(dto.getBusinessKey()); Long visaId = Long.valueOf(dto.getBusinessKey());
Long operatorId = Optional.ofNullable(dto.getLastOperationAssigner()) Long operatorId = Optional.ofNullable(dto.getLastOperationAssigner())
.filter(e -> StringUtils.hasText(e.getPersonId()))
.map(e -> Long.valueOf(e.getPersonId())) .map(e -> Long.valueOf(e.getPersonId()))
.orElse(null); .orElse(0L);
List<ChangeRecordRelation> essInstances = changeRecordRelationService.findByCondition(VisaRelationDto.builder() List<ChangeRecordRelation> essInstances = changeRecordRelationService.findByCondition(VisaRelationDto.builder()
.visaId(visaId) .visaId(visaId)
.varName(VisaRelationFieldEnum.PROCESS_INSTANCE_OF_ESS.name()) .varName(VisaRelationFieldEnum.PROCESS_INSTANCE_OF_ESS.name())

2
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java
View File

@ -322,7 +322,7 @@ public class VisaHelper {
ChangeRecord changeRecord = visaIdMap.get(key); ChangeRecord changeRecord = visaIdMap.get(key);
if (Objects.nonNull(changeRecord) && Objects.nonNull(changeRecord.getStatus())) { if (Objects.nonNull(changeRecord) && Objects.nonNull(changeRecord.getStatus())) {
Set<VisaButtonTypeEnum> buttons = VisaButtonTypeEnum.fetchBtnsByBizTypeAndStatusWhenPage(value, changeRecord.getStatus()); Set<VisaButtonTypeEnum> buttons = VisaButtonTypeEnum.fetchBtnsByBizTypeAndStatusWhenPage(value, changeRecord.getStatus());
if (Objects.equals(changeRecord.getStatus(), VisaStatusEnum.COMPLETED)) { if (Objects.equals(changeRecord.getStatus(), VisaStatusEnum.COMPLETED) && value.contains(VisaConfirmBizTypeEnum.CREATE)) {
switch (changeRecord.getStampStatus()) { switch (changeRecord.getStampStatus()) {
case UNPRINTED: case UNPRINTED:
buttons.add(VisaButtonTypeEnum.REQUEST_STAMP); buttons.add(VisaButtonTypeEnum.REQUEST_STAMP);

2
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java
View File

@ -159,7 +159,7 @@ public class ChangeRecordConfirmServiceImpl extends ServiceImpl<ChangeRecordConf
visaButtonTypeEnums.remove(VisaButtonTypeEnum.CHAT_GROUP_RECORD); visaButtonTypeEnums.remove(VisaButtonTypeEnum.CHAT_GROUP_RECORD);
} }
if (Objects.nonNull(stampStatus)) { if (Objects.nonNull(stampStatus) && bizTypes.contains(VisaConfirmBizTypeEnum.CREATE)) {
switch (stampStatus) { switch (stampStatus) {
case UNPRINTED: case UNPRINTED:
visaButtonTypeEnums.add(VisaButtonTypeEnum.REQUEST_STAMP); visaButtonTypeEnums.add(VisaButtonTypeEnum.REQUEST_STAMP);