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 f20cfe31ac3ab43307c926a940984de70e74e3bf..a1e69cc541bdea5833f58f3ae23de1de300481e8 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
@@ -17,11 +17,10 @@ package neatlogic.module.process.notify.handler.param;
import neatlogic.framework.notify.core.INotifyTriggerType;
import neatlogic.framework.process.dto.ProcessTaskStepVo;
+import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType;
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;
@@ -41,7 +40,7 @@ public class StepActiveTimeParamHandler extends ProcessTaskNotifyParamHandlerBas
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
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 0bce1f91ef62f93a0f938c8733a4bd2d8822bd40..9d3f4d2283db8e85d59f2fb7e08f0cc7bd7fa932 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
@@ -16,17 +16,16 @@ along with this program. If not, see .*/
package neatlogic.module.process.notify.handler.param;
import neatlogic.framework.dao.mapper.UserMapper;
-import neatlogic.framework.dto.*;
+import neatlogic.framework.dto.UserVo;
import neatlogic.framework.notify.core.INotifyTriggerType;
-import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
-import neatlogic.module.process.dao.mapper.SelectContentByHashMapper;
import neatlogic.framework.process.dto.ProcessTaskContentVo;
import neatlogic.framework.process.dto.ProcessTaskStepContentVo;
import neatlogic.framework.process.dto.ProcessTaskStepVo;
+import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType;
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 neatlogic.module.process.dao.mapper.SelectContentByHashMapper;
+import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -55,7 +54,7 @@ public class StepCommentListParamHandler extends ProcessTaskNotifyParamHandlerBa
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
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 f2f89cd5e9842dd97d596c6fd5b630392b16a0b3..ac5d525a2c67cee9449b1368143bf34b4862c3cd 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
@@ -18,9 +18,7 @@ package neatlogic.module.process.notify.handler.param;
import neatlogic.framework.notify.core.INotifyTriggerType;
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;
/**
@@ -37,13 +35,6 @@ public class StepIdParamHandler extends ProcessTaskNotifyParamHandlerBase {
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
- return null;
- }
- Long id = processTaskStepVo.getId();
- if (id != null) {
- return id;
- }
- return null;
+ return 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 3b892e23549557f070e31927899b558096ac7600..47c101894c4b9ff7bf30309b76abfe12fcc35191 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
@@ -16,12 +16,11 @@ 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.ProcessTaskNotifyTriggerType;
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 neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -44,7 +43,7 @@ public class StepNameParamHandler extends ProcessTaskNotifyParamHandlerBase {
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
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 360521dcacb5bc0c2a6e3c68982d3bb9de6d8066..c4e6aea69a39ec77e38ebd2981288e419360e4f4 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
@@ -17,11 +17,10 @@ package neatlogic.module.process.notify.handler.param;
import neatlogic.framework.notify.core.INotifyTriggerType;
import neatlogic.framework.process.dto.ProcessTaskStepVo;
+import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType;
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;
@@ -41,7 +40,7 @@ public class StepStartTimeParamHandler extends ProcessTaskNotifyParamHandlerBase
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
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 6958f977332e6fe232205dcd8dcdc3e561d89550..6282d966415b92cc1da50b7dc994b6a7c1b46cde 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
@@ -17,12 +17,11 @@ package neatlogic.module.process.notify.handler.param;
import neatlogic.framework.notify.core.INotifyTriggerType;
import neatlogic.framework.process.constvalue.ProcessTaskStepStatus;
+import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType;
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.notify.constvalue.SlaNotifyTriggerType;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -45,7 +44,7 @@ public class StepStayTimeParamHandler extends ProcessTaskNotifyParamHandlerBase
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
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 9b66652cc7e9215416c467293057787c5351bbf0..011ab4f2bdee1c774e8057be48214fbe29478807 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
@@ -25,14 +25,13 @@ import neatlogic.framework.dto.UserVo;
import neatlogic.framework.dto.WorkAssignmentUnitVo;
import neatlogic.framework.notify.core.INotifyTriggerType;
import neatlogic.framework.process.constvalue.ProcessUserType;
+import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType;
import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
import neatlogic.framework.process.dto.ProcessTaskStepUserVo;
import neatlogic.framework.process.dto.ProcessTaskStepVo;
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;
@@ -63,7 +62,7 @@ public class StepWorkerParamHandler extends ProcessTaskNotifyParamHandlerBase {
@Override
public Object getMyText(ProcessTaskStepVo processTaskStepVo, INotifyTriggerType notifyTriggerType) {
- if (!(notifyTriggerType instanceof ProcessTaskStepNotifyTriggerType) && !(notifyTriggerType instanceof SlaNotifyTriggerType)) {
+ if (notifyTriggerType instanceof ProcessTaskNotifyTriggerType) {
return null;
}
List workerList = processTaskMapper.getProcessTaskStepWorkerByProcessTaskIdAndProcessTaskStepId(processTaskStepVo.getProcessTaskId(), processTaskStepVo.getId());