diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_777a6c5f-6d09-406d-a69c-9102c6df5ef8/777a6c5f-6d09-406d-a69c-9102c6df5ef8.xml b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_777a6c5f-6d09-406d-a69c-9102c6df5ef8/777a6c5f-6d09-406d-a69c-9102c6df5ef8.xml
index bda83951..de8ebfb7 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/bo/_777a6c5f-6d09-406d-a69c-9102c6df5ef8/777a6c5f-6d09-406d-a69c-9102c6df5ef8.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/bo/_777a6c5f-6d09-406d-a69c-9102c6df5ef8/777a6c5f-6d09-406d-a69c-9102c6df5ef8.xml
@@ -4,7 +4,7 @@
admin
2023-05-31 15:34:37
admin
- 2023-06-08 13:18:29
+ 2023-06-12 19:42:48
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrNRRUyKFWFcP3I5OxsINbY6d/OdHngiPWQa53kS5aw6D/LZ1qRP6wMOOgIt80TCLq
false
流程模型清单
@@ -255,6 +255,110 @@
{}
+
+ 94e7f7ed-1858-4250-9604-a4a8fe4c4937
+ L1
+ L1
+ TEXT
+ 8
+ true
+
+ 60
+ AWSUI.Text
+ {"search":"0"}
+ true
+ false
+ true
+
+ ENTITY
+
+
+
+ 0
+
+ false
+
+
+ {}
+
+
+ 81c84a1c-952a-4089-bff8-76f607274840
+ L2
+ L2
+ TEXT
+ 8
+ true
+
+ 60
+ AWSUI.Text
+ {"search":"0"}
+ true
+ false
+ true
+
+ ENTITY
+
+
+
+ 0
+
+ false
+
+
+ {}
+
+
+ 886ebb69-c048-47c0-a3fa-850571a594a0
+ L3
+ L3
+ TEXT
+ 8
+ true
+
+ 60
+ AWSUI.Text
+ {"search":"0"}
+ true
+ false
+ true
+
+ ENTITY
+
+
+
+ 0
+
+ false
+
+
+ {}
+
+
+ 3723ad38-4f61-4e38-9c76-b3ea5e2605f9
+ L4
+ L4
+ TEXT
+ 8
+ true
+
+ 60
+ AWSUI.Text
+ {"search":"0"}
+ true
+ false
+ true
+
+ ENTITY
+
+
+
+ 0
+
+ false
+
+
+ {}
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
index b931243f..bf2aee3a 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_4e95a7af7bf1414f9e878d013192675e/obj_4e95a7af7bf1414f9e878d013192675e.xml
@@ -4,7 +4,7 @@
admin
2023-05-31 18:03:32
admin
- 2023-06-07 19:32:51
+ 2023-06-12 19:44:59
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGrfBc9hqIASUfUE0oNnMJX+ec3gaaVRTOXkn+Q9j7jtPqago5GSsGy8ZiXG2WLXK9d
false
1.0
@@ -42,7 +42,7 @@
-
+
@@ -55,6 +55,10 @@
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
index bd1cd02b..df1cb9e2 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
@@ -1,7 +1,6 @@
package com.actionsoft.apps.coe.pal.publisher.client.web;
import java.io.File;
-import java.sql.Array;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -23,9 +22,6 @@ import java.util.stream.Collectors;
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
-import com.actionsoft.apps.coe.pal.system.util.StringUtil;
-import com.actionsoft.exception.AWSDataAccessException;
-import com.actionsoft.sdk.local.api.BOAPI;
import com.actionsoft.exception.AWSDataAccessException;
import com.actionsoft.sdk.local.api.BOQueryAPI;
import org.apache.commons.lang.StringUtils;
@@ -4368,6 +4364,7 @@ public class ProcessPublishWeb extends ActionWeb {
return ro.toString();
}
+
/**
* 根据流程模型获取流程清单列表
*
@@ -4382,8 +4379,10 @@ public class ProcessPublishWeb extends ActionWeb {
JSONObject elements = (JSONObject) definitionJo.get("elements");
ArrayList bos = new ArrayList<>();
ResponseObject ro = ResponseObject.newOkResponse();
+ //流程架构等级
+ List processLevel = DBSql.getMaps(String.format("select PROPERTYID,PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYID in ('Process_Architecture_L1','Process_Architecture_L2','Process_Architecture_L3','Process_Architecture_L4') AND PLID='%s' ORDER BY PROPERTYID", publishFileId));
elements.forEach((k, v) -> {
- setShapeAttr(bos, publishFileId, (JSONObject) v, fileName);
+ setShapeAttr(bos, publishFileId, (JSONObject) v, fileName, processLevel);
});
if (bos.size() == 0) {
return ResponseObject.newErrResponse("模型不存在活动节点").toString();
@@ -4407,7 +4406,7 @@ public class ProcessPublishWeb extends ActionWeb {
* @param shape 形状
* @param fileName 文件名称
*/
- private void setShapeAttr(ArrayList bos, String publishFileId, JSONObject shape, String fileName) {
+ private void setShapeAttr(ArrayList bos, String publishFileId, JSONObject shape, String fileName , List processLevel) {
//只需要活动节点
if (shape.containsKey("category") && !shape.getString("title").equals("开始/结束")) {
BO bo = new BO();
@@ -4416,6 +4415,10 @@ public class ProcessPublishWeb extends ActionWeb {
bo.set("MODELTYPE", shape.getString("category"));
bo.set("SHAPETYPE", shape.getString("title"));
bo.set("SHAPENAME", shape.getString("text"));
+ //插入流程架构等级
+ for (int i = 0; i < processLevel.size(); i++) {
+ bo.set("L" + (i + 1), processLevel.get(i).getString("PROPERTYVALUE"));
+ }
if (shape.containsKey("dataAttributes")) {
JSONArray dataAttributes = shape.getJSONArray("dataAttributes");
if (dataAttributes.size() > 0) {