diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fc2ad73..11affdd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -47,4 +47,13 @@ public String getValue() { return value; } + + public static String getSourceByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getSource().equals(code)){ + return applyFromIdEnum.getSource(); + } + } + return ""; + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fc2ad73..11affdd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -47,4 +47,13 @@ public String getValue() { return value; } + + public static String getSourceByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getSource().equals(code)){ + return applyFromIdEnum.getSource(); + } + } + return ""; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index adac7f0..d25adf0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -59,10 +59,11 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); List resultList = new ArrayList<>(); - if(Objects.nonNull(request.getStatus()) && 1 == request.getStatus()){ + //审批消息 + if(Objects.nonNull(request.getStatus()) && 0 == request.getStatus()){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { if(StringUtils.isNotEmpty(request.getMessageSourceModule()) && - applyFromIdEnum.getSource().equals(request.getMessageSourceModule())){ + !applyFromIdEnum.getSource().equals(request.getMessageSourceModule())){ continue; } List toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fc2ad73..11affdd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -47,4 +47,13 @@ public String getValue() { return value; } + + public static String getSourceByCode(String code){ + for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { + if(applyFromIdEnum.getSource().equals(code)){ + return applyFromIdEnum.getSource(); + } + } + return ""; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index adac7f0..d25adf0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -59,10 +59,11 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); List resultList = new ArrayList<>(); - if(Objects.nonNull(request.getStatus()) && 1 == request.getStatus()){ + //审批消息 + if(Objects.nonNull(request.getStatus()) && 0 == request.getStatus()){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { if(StringUtils.isNotEmpty(request.getMessageSourceModule()) && - applyFromIdEnum.getSource().equals(request.getMessageSourceModule())){ + !applyFromIdEnum.getSource().equals(request.getMessageSourceModule())){ continue; } List toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java index b2d5c4e..afb74e8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java @@ -5,14 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; import com.casic.missiles.enums.notifyevent.AwareActionStatusEnum; +import com.casic.missiles.enums.system.ApplyFromIdEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.utils.SpringContextUtil; import com.casic.missiles.utils.WebSocket; import lombok.extern.slf4j.Slf4j; @@ -77,6 +78,7 @@ approvalMessage.setNoticeId(rootId); approvalMessage.setNoticeDeptId(user.getDeptId()); approvalMessage.setMessageTitle("结果通知"); + approvalMessage.setMessageSourceModule(ApplyFromIdEnum.getSourceByCode(formId)); approvalMessage.setMessageContent(formName); approvalMessage.setFormId(formId); approvalMessage.setCreateTime(DateUtil.now());