diff --git a/src/main/java/neatlogic/framework/process/exception/processtaskserialnumberpolicy/ProcessTaskSerialNumberPolicyNotFoundException.java b/src/main/java/neatlogic/framework/process/exception/processtaskserialnumberpolicy/ProcessTaskSerialNumberPolicyNotFoundException.java index 8960f84eb7cfd221b35c58ab6b1c316f3f1af68a..f3db535f81fdea2865e6e0cc50510667e6d59397 100644 --- a/src/main/java/neatlogic/framework/process/exception/processtaskserialnumberpolicy/ProcessTaskSerialNumberPolicyNotFoundException.java +++ b/src/main/java/neatlogic/framework/process/exception/processtaskserialnumberpolicy/ProcessTaskSerialNumberPolicyNotFoundException.java @@ -6,7 +6,7 @@ public class ProcessTaskSerialNumberPolicyNotFoundException extends ApiRuntimeEx private static final long serialVersionUID = 8251360686469779326L; - public ProcessTaskSerialNumberPolicyNotFoundException(String channelTypeUuid) { - super("服务类型:“{0}”没有配置工单生成策略", channelTypeUuid); + public ProcessTaskSerialNumberPolicyNotFoundException(String name) { + super("nfpep.processtaskserialnumberpolicynotfoundexception.processtaskserialnumberpolicynotfoundexception", name); } } diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index 2e7b3c74a3a1b99cb43ea46482f668772dcb02a7..1f38f6206feca6aba7a0a9d8be482cb4246c0139 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -43,6 +43,7 @@ import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; +import neatlogic.framework.process.exception.channeltype.ChannelTypeNotFoundException; import neatlogic.framework.process.exception.operationauth.ProcessTaskStepRunningException; import neatlogic.framework.process.exception.processtask.*; import neatlogic.framework.process.exception.core.ProcessTaskRuntimeException; @@ -90,6 +91,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { protected static FormMapper formMapper; // protected static IProcessCrossoverMapper processCrossoverMapper; protected static ChannelMapper channelMapper; + protected static ChannelTypeMapper channelTypeMapper; protected static NotifyMapper notifyMapper; protected static ProcessTaskSerialNumberMapper processTaskSerialNumberMapper; protected static SelectContentByHashMapper selectContentByHashMapper; @@ -127,6 +129,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { channelMapper = _channelMapper; } + @Resource + public void setChannelTypeMapper(ChannelTypeMapper _channelTypeMapper) { + channelTypeMapper = _channelTypeMapper; + } + @Resource public void setNotifyMapper(NotifyMapper _notifyMapper) { notifyMapper = _notifyMapper; @@ -1779,7 +1786,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 生成工单号 **/ ProcessTaskSerialNumberPolicyVo processTaskSerialNumberPolicyVo = processTaskSerialNumberMapper.getProcessTaskSerialNumberPolicyByChannelTypeUuid(channelVo.getChannelTypeUuid()); if (processTaskSerialNumberPolicyVo == null) { - throw new ProcessTaskSerialNumberPolicyNotFoundException(channelVo.getChannelTypeUuid()); + ChannelTypeVo channelTypeVo = channelTypeMapper.getChannelTypeByUuid(channelVo.getChannelTypeUuid()); + if (channelTypeVo == null) { + throw new ChannelTypeNotFoundException(channelVo.getChannelTypeUuid()); + } + throw new ProcessTaskSerialNumberPolicyNotFoundException(channelTypeVo.getName()); } IProcessTaskSerialNumberPolicyHandler policyHandler = ProcessTaskSerialNumberPolicyHandlerFactory.getHandler(processTaskSerialNumberPolicyVo.getHandler()); if (policyHandler == null) {