From 5c574f348751514a31b7bf278177ac22fcda83ed Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 13 Nov 2024 18:18:32 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=AD=E5=8A=A8=E4=BD=9C=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E5=80=BC=E9=80=89=E9=A1=B9=E4=B8=AD=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=8A=A8=E4=BD=9C=E8=A7=A6=E5=8F=91=E4=BA=BA=E7=94=A8?=
=?UTF-8?q?=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1288198007783424]流程节点中动作设置参数值选项中添加动作触发人用户ID http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1288198007783424
---
.../framework/process/constvalue/ProcessTaskParams.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
index 02c44422..aaeb9c1f 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
@@ -19,6 +19,7 @@ public enum ProcessTaskParams {
OWNERLEVEL("ownerlevel", "上报人级别"),
STEPTASK("steptask", "子任务"),
ACTIONTRIGGERUSER("actiontriggeruser", "动作触发人"),
+ ACTIONTRIGGERUSERID("actiontriggeruserid", "动作触发人用户ID"),
STEPTASKID("steptaskid", "子任务ID");
private String value;
--
Gitee
From 581f3955a48e29c9143b3bf00cd57ae0f5053f90 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Wed, 13 Nov 2024 20:23:02 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=86=E7=B1=BB=E4=BC=98=E5=8C=96=20#[1289?=
=?UTF-8?q?021903306752]=E5=B7=A5=E5=8D=95=E4=B8=AD=E5=BF=83=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090/demo/rdm?=
=?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/12890219033?=
=?UTF-8?q?06752?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../process/constvalue/ItsmTenantConfig.java | 1 +
.../WorkcenterCustomCountLimitException.java | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 src/main/java/neatlogic/framework/process/exception/workcenter/WorkcenterCustomCountLimitException.java
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java
index fa0dd001..fd937b9b 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java
@@ -25,6 +25,7 @@ public enum ItsmTenantConfig implements ITenantConfig {
SLA_TIME_DISPLAY_MODE("sla.time.display.mode", "naturalTime", "nfpc.itsmtenantconfig.slatimedisplaymode"),
PROCESS_TASK_STEP_COMMENT_EDITOR_TOOLBAR_IS_SHOW("processTaskStepCommentEditorToolbarIsShow", "1", "term.itsm.isshowprocesstaskstepcommenteditortoolbar"),
WORKCENTER_AUTO_REFRESH("workcenter.auto.refresh", "1", "nfpc.itsmtenantconfig.workcenterrefresh"),
+ WORKCENTER_CUSTOM_LIMIT("workcenter.custom.limit", "5", "nfpc.itsmtenantconfig.workcentercustomlimit"),
;
String key;
diff --git a/src/main/java/neatlogic/framework/process/exception/workcenter/WorkcenterCustomCountLimitException.java b/src/main/java/neatlogic/framework/process/exception/workcenter/WorkcenterCustomCountLimitException.java
new file mode 100644
index 00000000..d87aab07
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/exception/workcenter/WorkcenterCustomCountLimitException.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package neatlogic.framework.process.exception.workcenter;
+
+import neatlogic.framework.process.exception.core.ProcessTaskRuntimeException;
+
+public class WorkcenterCustomCountLimitException extends ProcessTaskRuntimeException {
+
+ public WorkcenterCustomCountLimitException(int limit) {
+ super("nfpew.workcentercustomcountlimitexception.workcentercustomcountlimitexception", limit);
+ }
+
+
+}
--
Gitee
From a60a6be65d72407b09363dfd6ce4e10f90b56a01 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 14 Nov 2024 17:37:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20it=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?-=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1280397936132096]it服务-审批节点通知优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1280397936132096
---
.../core/IProcessStepTaskHandler.java | 39 +++++++++++++
.../core/ProcessStepTaskHandlerBase.java | 21 +++++++
.../core/ProcessStepTaskHandlerFactory.java | 57 +++++++++++++++++++
3 files changed, 117 insertions(+)
create mode 100644 src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java
create mode 100644 src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
create mode 100644 src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java b/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java
new file mode 100644
index 00000000..b8c8b97b
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package neatlogic.framework.process.steptaskhandler.core;
+
+import neatlogic.framework.process.dto.ProcessTaskStepUserVo;
+import neatlogic.framework.process.dto.ProcessTaskStepVo;
+
+import java.util.List;
+
+public interface IProcessStepTaskHandler {
+ /**
+ * 返回控件
+ *
+ * @return 控件名
+ */
+ List getHandlerList();
+
+ /**
+ * 获取协助处理人列表,用于通知接收人
+ * @param currentProcessTaskStepVo
+ * @return
+ */
+ List getMinorUserListForNotifyReceiver(ProcessTaskStepVo currentProcessTaskStepVo);
+}
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
new file mode 100644
index 00000000..bafeb55a
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package neatlogic.framework.process.steptaskhandler.core;
+
+public abstract class ProcessStepTaskHandlerBase implements IProcessStepTaskHandler {
+}
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java
new file mode 100644
index 00000000..406609b5
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package neatlogic.framework.process.steptaskhandler.core;
+
+import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBase;
+import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
+import neatlogic.framework.common.RootComponent;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.core.annotation.Order;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RootComponent
+@Order(10)
+public class ProcessStepTaskHandlerFactory extends ModuleInitializedListenerBase {
+ private static final Map componentMap = new HashMap<>();
+
+ public static IProcessStepTaskHandler getHandler(String handler) {
+ return componentMap.get(handler);
+ }
+
+ @Override
+ protected void onInitialized(NeatLogicWebApplicationContext context) {
+ Map myMap = context.getBeansOfType(IProcessStepTaskHandler.class);
+ for (Map.Entry entry : myMap.entrySet()) {
+ IProcessStepTaskHandler component = entry.getValue();
+ List handlerList = component.getHandlerList();
+ if (CollectionUtils.isNotEmpty(handlerList)) {
+ for (String handler : handlerList) {
+ componentMap.put(handler, component);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void myInit() {
+
+ }
+}
--
Gitee
From cded35f41ad91432d3aa48d63f9fc31ef5378986 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 14 Nov 2024 18:53:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20it=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?-=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1280397936132096]it服务-审批节点通知优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1280397936132096
---
.../core/IProcessStepAssistantHandler.java} | 15 ++++++------
.../ProcessStepAssistantHandlerFactory.java} | 23 ++++++++-----------
.../core/ProcessStepTaskHandlerBase.java | 21 -----------------
3 files changed, 16 insertions(+), 43 deletions(-)
rename src/main/java/neatlogic/framework/process/{steptaskhandler/core/IProcessStepTaskHandler.java => stephandler/core/IProcessStepAssistantHandler.java} (84%)
rename src/main/java/neatlogic/framework/process/{steptaskhandler/core/ProcessStepTaskHandlerFactory.java => stephandler/core/ProcessStepAssistantHandlerFactory.java} (59%)
delete mode 100644 src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java
similarity index 84%
rename from src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java
rename to src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java
index b8c8b97b..5a64c917 100644
--- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java
@@ -15,20 +15,19 @@
* along with this program. If not, see .
*/
-package neatlogic.framework.process.steptaskhandler.core;
+package neatlogic.framework.process.stephandler.core;
import neatlogic.framework.process.dto.ProcessTaskStepUserVo;
import neatlogic.framework.process.dto.ProcessTaskStepVo;
import java.util.List;
-public interface IProcessStepTaskHandler {
- /**
- * 返回控件
- *
- * @return 控件名
- */
- List getHandlerList();
+/**
+ * 用于获取步骤任务的协助处理人
+ */
+public interface IProcessStepAssistantHandler {
+
+ String getHandler();
/**
* 获取协助处理人列表,用于通知接收人
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java
similarity index 59%
rename from src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java
rename to src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java
index 406609b5..6982cc38 100644
--- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java
@@ -15,37 +15,32 @@
* along with this program. If not, see .
*/
-package neatlogic.framework.process.steptaskhandler.core;
+package neatlogic.framework.process.stephandler.core;
import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBase;
import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
import neatlogic.framework.common.RootComponent;
-import org.apache.commons.collections4.CollectionUtils;
import org.springframework.core.annotation.Order;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@RootComponent
@Order(10)
-public class ProcessStepTaskHandlerFactory extends ModuleInitializedListenerBase {
- private static final Map componentMap = new HashMap<>();
+public class ProcessStepAssistantHandlerFactory extends ModuleInitializedListenerBase {
+ private static Map componentMap = new HashMap<>();
- public static IProcessStepTaskHandler getHandler(String handler) {
+ public static IProcessStepAssistantHandler getHandler(String handler) {
return componentMap.get(handler);
}
@Override
protected void onInitialized(NeatLogicWebApplicationContext context) {
- Map myMap = context.getBeansOfType(IProcessStepTaskHandler.class);
- for (Map.Entry entry : myMap.entrySet()) {
- IProcessStepTaskHandler component = entry.getValue();
- List handlerList = component.getHandlerList();
- if (CollectionUtils.isNotEmpty(handlerList)) {
- for (String handler : handlerList) {
- componentMap.put(handler, component);
- }
+ Map myMap = context.getBeansOfType(IProcessStepAssistantHandler.class);
+ for (Map.Entry entry : myMap.entrySet()) {
+ IProcessStepAssistantHandler component = entry.getValue();
+ if (component.getHandler() != null) {
+ componentMap.put(component.getHandler(), component);
}
}
}
diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
deleted file mode 100644
index bafeb55a..00000000
--- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package neatlogic.framework.process.steptaskhandler.core;
-
-public abstract class ProcessStepTaskHandlerBase implements IProcessStepTaskHandler {
-}
--
Gitee
From 46c1fb5d4244a0a857e895ceaef2a3094395157e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 15 Nov 2024 16:21:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82?=
=?UTF-8?q?=E7=82=B9-=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85-=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1287550214307840]流程管理-自动化节点-作业详情-作业参数赋值新增选项 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1287550214307840
---
.../process/constvalue/ConditionProcessTaskOptions.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java b/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
index a7995b6b..ad657dcf 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
@@ -5,6 +5,8 @@ import neatlogic.framework.util.$;
public enum ConditionProcessTaskOptions {
TASKID("id", "工单ID"),
STEPID("stepid", "步骤ID"),
+ STEPNAME("stepname", "步骤名称"),
+
TITLE("title", "标题"),
CHANNELTYPE("channeltype", "服务类型"),
CONTENT("content", "上报内容"),
@@ -16,6 +18,7 @@ public enum ConditionProcessTaskOptions {
OWNERCOMPANY("ownercompany", "上报人公司"),
OWNERCENTER("ownercenter", "上报人中心"),
OWNERDEPARTMENT("ownerdepartment", "上报人部门"),
+ OWNERDEPARTMENTPATH("ownerdepartmentpath", "上报人部门(完整)"),
OWNERTEAM("ownerteam", "上报人组"),
OWNERROLE("ownerrole", "上报人角色"),
OWNERLEVEL("ownerlevel", "上报人级别"),
--
Gitee
From 6e96c5ca60147d6b18ada9277baa814e337a367d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 15 Nov 2024 16:32:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82?=
=?UTF-8?q?=E7=82=B9-=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85-=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1287550214307840]流程管理-自动化节点-作业详情-作业参数赋值新增选项 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1287550214307840
---
.../process/constvalue/ConditionProcessTaskOptions.java | 3 ---
.../framework/process/constvalue/ProcessTaskParams.java | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java b/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
index ad657dcf..a7995b6b 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ConditionProcessTaskOptions.java
@@ -5,8 +5,6 @@ import neatlogic.framework.util.$;
public enum ConditionProcessTaskOptions {
TASKID("id", "工单ID"),
STEPID("stepid", "步骤ID"),
- STEPNAME("stepname", "步骤名称"),
-
TITLE("title", "标题"),
CHANNELTYPE("channeltype", "服务类型"),
CONTENT("content", "上报内容"),
@@ -18,7 +16,6 @@ public enum ConditionProcessTaskOptions {
OWNERCOMPANY("ownercompany", "上报人公司"),
OWNERCENTER("ownercenter", "上报人中心"),
OWNERDEPARTMENT("ownerdepartment", "上报人部门"),
- OWNERDEPARTMENTPATH("ownerdepartmentpath", "上报人部门(完整)"),
OWNERTEAM("ownerteam", "上报人组"),
OWNERROLE("ownerrole", "上报人角色"),
OWNERLEVEL("ownerlevel", "上报人级别"),
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
index aaeb9c1f..9f3574ad 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskParams.java
@@ -3,6 +3,7 @@ package neatlogic.framework.process.constvalue;
public enum ProcessTaskParams {
TASKID("id", "工单ID"),
STEPID("stepid", "步骤ID"),
+ STEPNAME("stepname", "步骤名称"),
TITLE("title", "标题"),
CHANNELTYPE("channeltype", "服务类型"),
CONTENT("content", "上报内容"),
@@ -14,6 +15,7 @@ public enum ProcessTaskParams {
OWNERCOMPANY("ownercompany", "上报人公司"),
OWNERCENTER("ownercenter", "上报人中心"),
OWNERDEPARTMENT("ownerdepartment", "上报人部门"),
+ OWNERDEPARTMENTPATH("ownerdepartmentpath", "上报人部门(完整)"),
OWNERTEAM("ownerteam", "上报人组"),
OWNERROLE("ownerrole", "上报人角色"),
OWNERLEVEL("ownerlevel", "上报人级别"),
--
Gitee