From dfd4a4020a242a91bfb3f7b4375ac609cf66cdc8 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 16 Aug 2024 17:17:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=89=8D=E7=BD=AE=E6=AD=A5=E9=AA=A4=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1211578056146944]通知策略梳理每个触发点的收件人，没用的收件人去掉，如激活的处理人 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1211578056146944 --- .../handler/AutomaticNotifyPolicyHandler.java | 71 +++--------------- .../OmnipotentNotifyPolicyHandler.java | 73 ++----------------- 2 files changed, 16 insertions(+), 128 deletions(-) diff --git a/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java index d4cd8a8f9..d7ba302ac 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/AutomaticNotifyPolicyHandler.java @@ -1,22 +1,15 @@ package neatlogic.module.process.notify.handler; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.common.constvalue.Expression; -import neatlogic.framework.common.constvalue.ParamType; -import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.dto.ExpressionVo; -import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; import neatlogic.framework.notify.dto.NotifyTriggerVo; import neatlogic.framework.process.auth.PROCESS_MODIFY; -import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; -import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.notify.constvalue.*; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepAutomaticNotifyParam; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepAutomaticNotifyTriggerType; +import neatlogic.framework.process.notify.core.ProcessTaskNotifyHandlerBase; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -31,7 +24,7 @@ import java.util.List; **/ @Component -public class AutomaticNotifyPolicyHandler extends NotifyPolicyHandlerBase { +public class AutomaticNotifyPolicyHandler extends ProcessTaskNotifyHandlerBase { @Override public String getName() { return ProcessStepHandlerType.AUTOMATIC.getName(); @@ -46,11 +39,8 @@ public class AutomaticNotifyPolicyHandler extends NotifyPolicyHandlerBase { } @Override - protected List myNotifyTriggerList() { + protected List myCustomNotifyTriggerList() { List returnList = new ArrayList<>(); - for (ProcessTaskStepNotifyTriggerType notifyTriggerType : ProcessTaskStepNotifyTriggerType.values()) { - returnList.add(new NotifyTriggerVo(notifyTriggerType)); - } for (ProcessTaskStepAutomaticNotifyTriggerType notifyTriggerType : ProcessTaskStepAutomaticNotifyTriggerType.values()) { returnList.add(new NotifyTriggerVo(notifyTriggerType)); } @@ -58,14 +48,8 @@ public class AutomaticNotifyPolicyHandler extends NotifyPolicyHandlerBase { } @Override - protected List mySystemParamList() { + protected List myCustomSystemParamList() { List notifyPolicyParamList = new ArrayList<>(); - for(ProcessTaskNotifyParam param : ProcessTaskNotifyParam.values()) { - notifyPolicyParamList.add(createConditionParam(param)); - } - for(ProcessTaskStepNotifyParam param : ProcessTaskStepNotifyParam.values()) { - notifyPolicyParamList.add(createConditionParam(param)); - } for (ProcessTaskStepAutomaticNotifyParam param : ProcessTaskStepAutomaticNotifyParam.values()) { notifyPolicyParamList.add(createConditionParam(param)); } @@ -73,44 +57,9 @@ public class AutomaticNotifyPolicyHandler extends NotifyPolicyHandlerBase { } @Override - protected List mySystemConditionOptionList() { - List notifyPolicyParamList = new ArrayList<>(); - for(ConditionProcessTaskOptions option : ConditionProcessTaskOptions.values()) { - IConditionHandler condition = ProcessTaskConditionFactory.getHandler(option.getValue()); - if(condition != null) { - ConditionParamVo param = new ConditionParamVo(); - param.setName(condition.getName()); - param.setLabel(condition.getDisplayName()); - param.setController(condition.getHandler(FormConditionModel.CUSTOM)); - if(condition.getConfig() != null) { - param.setConfig(condition.getConfig().toJSONString()); - } - param.setType(condition.getType()); - ParamType paramType = condition.getParamType(); - if(paramType != null) { - param.setParamType(paramType.getName()); - param.setParamTypeName(paramType.getText()); - param.setDefaultExpression(paramType.getDefaultExpression().getExpression()); - for(Expression expression : paramType.getExpressionList()) { - param.getExpressionList().add(new ExpressionVo(expression.getExpression(), expression.getExpressionName(),expression.getIsShowConditionValue())); - } - } - - param.setIsEditable(0); - notifyPolicyParamList.add(param); - } - } - return notifyPolicyParamList; - } - - @Override - protected void myAuthorityConfig(JSONObject config) { - List groupList = JSON.parseArray(config.getJSONArray("groupList").toJSONString(), String.class); - groupList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue()); - config.put("groupList", groupList); - List includeList = JSON.parseArray(config.getJSONArray("includeList").toJSONString(), String.class); - includeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.DEFAULT_WORKER.getValue()); - includeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.FOCUS_USER.getValue()); - config.put("includeList", includeList); + protected void myCustomAuthorityConfig(JSONObject config) { + List excludeList = config.getJSONArray("excludeList").toJavaList(String.class); + excludeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.MINOR.getValue()); + config.put("excludeList", excludeList); } } diff --git a/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java b/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java index c7e7dbb7d..bcb2771a6 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/OmnipotentNotifyPolicyHandler.java @@ -1,29 +1,19 @@ package neatlogic.module.process.notify.handler; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.common.constvalue.Expression; -import neatlogic.framework.common.constvalue.ParamType; -import neatlogic.framework.condition.core.IConditionHandler; import neatlogic.framework.dto.ConditionParamVo; -import neatlogic.framework.dto.ExpressionVo; -import neatlogic.framework.form.constvalue.FormConditionModel; -import neatlogic.framework.notify.core.NotifyPolicyHandlerBase; import neatlogic.framework.notify.dto.NotifyTriggerVo; import neatlogic.framework.process.auth.PROCESS_MODIFY; -import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; -import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; -import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.notify.constvalue.*; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyParam; +import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; +import neatlogic.framework.process.notify.core.ProcessTaskNotifyHandlerBase; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; @Component -public class OmnipotentNotifyPolicyHandler extends NotifyPolicyHandlerBase { +public class OmnipotentNotifyPolicyHandler extends ProcessTaskNotifyHandlerBase { @Override public String getName() { @@ -31,11 +21,8 @@ public class OmnipotentNotifyPolicyHandler extends NotifyPolicyHandlerBase { } @Override - public List myNotifyTriggerList() { + public List myCustomNotifyTriggerList() { List returnList = new ArrayList<>(); - for (ProcessTaskStepNotifyTriggerType notifyTriggerType : ProcessTaskStepNotifyTriggerType.values()) { - returnList.add(new NotifyTriggerVo(notifyTriggerType)); - } //任务 for (ProcessTaskStepTaskNotifyTriggerType notifyTriggerType : ProcessTaskStepTaskNotifyTriggerType.values()) { returnList.add(new NotifyTriggerVo(notifyTriggerType)); @@ -44,62 +31,14 @@ public class OmnipotentNotifyPolicyHandler extends NotifyPolicyHandlerBase { } @Override - protected List mySystemParamList() { + protected List myCustomSystemParamList() { List notifyPolicyParamList = new ArrayList<>(); - for(ProcessTaskNotifyParam param : ProcessTaskNotifyParam.values()) { - notifyPolicyParamList.add(createConditionParam(param)); - } - for(ProcessTaskStepNotifyParam param : ProcessTaskStepNotifyParam.values()) { - notifyPolicyParamList.add(createConditionParam(param)); - } for(ProcessTaskStepTaskNotifyParam param : ProcessTaskStepTaskNotifyParam.values()) { notifyPolicyParamList.add(createConditionParam(param)); } return notifyPolicyParamList; } - @Override - protected List mySystemConditionOptionList() { - List notifyPolicyParamList = new ArrayList<>(); - for(ConditionProcessTaskOptions option : ConditionProcessTaskOptions.values()) { - IConditionHandler condition = ProcessTaskConditionFactory.getHandler(option.getValue()); - if(condition != null) { - ConditionParamVo param = new ConditionParamVo(); - param.setName(condition.getName()); - param.setLabel(condition.getDisplayName()); - param.setController(condition.getHandler(FormConditionModel.CUSTOM)); - if(condition.getConfig() != null) { - param.setConfig(condition.getConfig().toJSONString()); - } - param.setType(condition.getType()); - ParamType paramType = condition.getParamType(); - if(paramType != null) { - param.setParamType(paramType.getName()); - param.setParamTypeName(paramType.getText()); - param.setDefaultExpression(paramType.getDefaultExpression().getExpression()); - for(Expression expression : paramType.getExpressionList()) { - param.getExpressionList().add(new ExpressionVo(expression.getExpression(), expression.getExpressionName(),expression.getIsShowConditionValue())); - } - } - - param.setIsEditable(0); - notifyPolicyParamList.add(param); - } - } - return notifyPolicyParamList; - } - - @Override - protected void myAuthorityConfig(JSONObject config) { - List groupList = JSON.parseArray(config.getJSONArray("groupList").toJSONString(), String.class); - groupList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue()); - config.put("groupList", groupList); - List includeList = JSON.parseArray(config.getJSONArray("includeList").toJSONString(), String.class); - includeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.DEFAULT_WORKER.getValue()); - includeList.add(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue() + "#" + ProcessUserType.FOCUS_USER.getValue()); - config.put("includeList", includeList); - } - @Override public String getAuthName() { return PROCESS_MODIFY.class.getSimpleName(); -- Gitee From b73654a28bef6e2e279851414bea67b580d578af Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 19 Aug 2024 15:23:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=A2=B3=E7=90=86=E6=AF=8F=E4=B8=AA=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=82=B9=E7=9A=84=E6=94=B6=E4=BB=B6=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=9A=84=E6=94=B6=E4=BB=B6=E4=BA=BA=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=8C=E5=A6=82=E6=BF=80=E6=B4=BB=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1211578056146944]通知策略梳理每个触发点的收件人，没用的收件人去掉，如激活的处理人 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1211578056146944 --- .../param/CurrentStepCompleteContentParamHandler.java | 2 +- .../notify/handler/param/StepActiveTimeParamHandler.java | 5 +++-- .../notify/handler/param/StepCommentListParamHandler.java | 3 ++- .../process/notify/handler/param/StepIdParamHandler.java | 3 ++- .../process/notify/handler/param/StepNameParamHandler.java | 3 ++- .../notify/handler/param/StepStartTimeParamHandler.java | 5 +++-- .../notify/handler/param/StepStayTimeParamHandler.java | 3 ++- .../process/notify/handler/param/StepWorkerParamHandler.java | 3 ++- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java index 64fb876a5..f5442cefb 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java @@ -47,7 +47,7 @@ public class CurrentStepCompleteContentParamHandler extends ProcessTaskNotifyPar @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType == ProcessTaskStepNotifyTriggerType.BACK)) { + if (!(notifyTriggerType == ProcessTaskStepNotifyTriggerType.SUCCEED)) { return null; } // 查询步骤的所有处理内容，已倒序排好 diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java index f1980893e..f20cfe31a 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java @@ -16,11 +16,12 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -40,7 +41,7 @@ public class StepActiveTimeParamHandler extends ProcessTaskNotifyParamHandlerBas @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java index 589d37fdd..0bce1f91e 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java @@ -26,6 +26,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -54,7 +55,7 @@ public class StepCommentListParamHandler extends ProcessTaskNotifyParamHandlerBa @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } List processTaskStepContentList = processTaskMapper.getProcessTaskStepContentByProcessTaskStepId(processTaskStepVo.getId()); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java index aea1940d5..f2f89cd5e 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepIdParamHandler.java @@ -20,6 +20,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; /** @@ -36,7 +37,7 @@ public class StepIdParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } Long id = processTaskStepVo.getId(); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java index 66bef42c0..3b892e235 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java @@ -21,6 +21,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -43,7 +44,7 @@ public class StepNameParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } String name = processTaskStepVo.getName(); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java index 4b6cdfec5..360521dca 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java @@ -16,11 +16,12 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -40,7 +41,7 @@ public class StepStartTimeParamHandler extends ProcessTaskNotifyParamHandlerBase @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java index e6be52110..6958f9773 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java @@ -22,6 +22,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -44,7 +45,7 @@ public class StepStayTimeParamHandler extends ProcessTaskNotifyParamHandlerBase @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } ProcessTaskStepVo stepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepVo.getId()); diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java index 1038408bd..9b66652cc 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java @@ -32,6 +32,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.notify.constvalue.SlaNotifyTriggerType; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -62,7 +63,7 @@ public class StepWorkerParamHandler extends ProcessTaskNotifyParamHandlerBase { @Override public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) { - if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType)) { + if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) { return null; } List workerList = processTaskMapper.getProcessTaskStepWorkerByProcessTaskIdAndProcessTaskStepId(processTaskStepVo.getProcessTaskId(), processTaskStepVo.getId()); -- Gitee