diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
index bacf0ac6..44a465ef 100644
--- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml
@@ -6,55 +6,31 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
index b14664e3..cafe8320 100644
--- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
+++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.schema.tpl
@@ -366,7 +366,7 @@ Schema.addShape({name:"method_service_node", title:"线下审批", text:"线下
-/***Method*/Schema.addShape({name:"method_approval_node3", title:"系统活动", text:"系统活动",groupName:"features3", category:"process_epc", props:{w:110, h:50}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+/***Method*/Schema.addShape({name:"method_approval_node3", title:"系统任务", text:"系统任务",groupName:"features3", category:"process_epc", props:{w:110, h:50}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
{actions:[
{action:"move", x:"w*0", y:"5"},
{action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
@@ -383,7 +383,7 @@ Schema.addShape({name:"method_service_node", title:"线下审批", text:"线下
{lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid"}, actions:{ref:"method_service_task"}},
{lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
]});
-Schema.addShape({name:"method_service_node4", title:"人工活动", text:"人工活动",groupName:"features3", category:"process_epc", props:{w:110, h:50}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工任务",groupName:"features3", category:"process_epc", props:{w:110, h:50}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
{actions:[
{action:"move", x:"w*0", y:"5"},
{action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
diff --git a/com.actionsoft.apps.coe.pal.output.pr/manifest.xml b/com.actionsoft.apps.coe.pal.output.pr/manifest.xml
index 68178f57..8c4f3c7c 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/manifest.xml
+++ b/com.actionsoft.apps.coe.pal.output.pr/manifest.xml
@@ -3,11 +3,11 @@
流程手册
1.0
- 23
+ 28
北京炎黄盈动科技发展有限责任公司
6636fc53728276eb3baca55938356b74
false
- 2022-05-24
+ 2022-06-29
true
-
-
+
+
cross
@@ -43,7 +43,7 @@
false
com.actionsoft.apps.coe.pal.output
- 2022-05-24 21:38:14
+ 2022-06-29 19:18:36
diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java
index 4ac592c3..642b0ee0 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java
+++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java
@@ -107,7 +107,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator() {
@Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
- return o2.getVersion() - o1.getVersion();
+ return (int) (o2.getVersion() - o1.getVersion());
}
});
if (versions == null) {
diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.doc b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.doc
new file mode 100644
index 00000000..66f81890
Binary files /dev/null and b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.doc differ
diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.xml
new file mode 100644
index 00000000..6c5ed038
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册.xml
@@ -0,0 +1,6716 @@
+
+
+
+
+
+
+
+ Actionsoft Co.,Ltd
+ AWS CoE Report
+ sunlianhui
+ 2
+ 0
+ 2019-10-21T06:16:00Z
+ 2019-10-21T06:16:00Z
+ 5
+ 340
+ 1943
+ 0
+ 16
+ 4
+ 2279
+ 15
+
+
+ 2052-9.1.0.4993
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+
+
+
+ 流程手册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${company}
+
+
+
+
+
+
+
+
+
+
+
+ \
+
+
+
+
+
+
+
+
+
+
+
+
+ ${department}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${generate_date}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TOC \o "1-4" \h \z \f
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+ 流程手册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADMANQAAAA==
+ PAGEREF _Toc22559735 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.
+
+
+
+
+
+
+
+
+ 业务流程基本属性表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADMANgAAAA==
+ PAGEREF _Toc22559736 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.
+
+
+
+
+
+
+
+
+ 流程图
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADMANwAAAA==
+ PAGEREF _Toc22559737 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.
+
+
+
+
+
+
+
+
+ 流程步骤及说明
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADMAOAAAAA==
+ PAGEREF _Toc22559738 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4.
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADMAOQAAAA==
+ PAGEREF _Toc22559739 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.
+
+
+
+
+
+
+
+
+ 版本修改履历
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CNDJ6nn5us4RjIIAqgBLqQsCAAAACAAAAA0AAABfAFQAbwBjADIAMgA1ADUAOQA3ADQAMAAAAA==
+ PAGEREF _Toc22559740 \h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 页眉左上：
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+
+ 流程手册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ────────────────────────────────────────────────
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ────────────────────────────────────────────────
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 页脚：页码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ page
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+ 流程手册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.
+
+
+
+
+
+
+ 业务流程基本属性表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_responsible_person}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 责任部门
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_responsible_department}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 执行部门
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_executive_arm}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程输入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_input}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程输出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_out}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程说明
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_desc}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编制人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_create_user}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 版本号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.
+
+
+
+
+
+
+ 流程图
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 页眉左上：
+
+
+
+
+
+
+
+
+
+
+ ${repository_name}
+
+
+
+
+
+
+
+
+
+ 流程手册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ────────────────────────────────────────────────
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ────────────────────────────────────────────────
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 页脚：页码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ page
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${pl_diagram}
+ 3
+
+
+
+
+
+ .
+
+
+
+
+
+
+ 流程步骤及说明
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+ .1.
+
+
+
+
+
+
+ 流程步骤的工作内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程步骤名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 涉及部门及岗位\角色
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工作详细描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 制度条款要求
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ KPI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作业单据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 处理时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 信息系统
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+ <#list repository_shape_table as table1>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.serial_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_duty_r}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_approval_a}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_counselor_c}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_notify_i}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_desc}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_institution}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_danger}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_kpi}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_form}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_handle_time}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table1.shape_itsystem}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <#list table1.shape_File_Table as table11>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table11.shape_file_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+ .
+
+
+
+
+
+
+ 流程步骤的风控要求
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 步骤
+
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险影响
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 风险概率
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制目标类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制目标
+
+
+
+
+ <#list danger_table as table2>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.serial_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.related_shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_riskType}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_effect}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_probability}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_targetType}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table2.shape_target}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 步骤
+
+
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制
+
+
+
+
+
+
+
+
+ 编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制
+
+
+
+
+
+
+
+
+ 名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制措施
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制方法
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制
+
+
+
+
+
+
+
+
+ 类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制频率
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 控制
+
+
+
+
+
+
+
+
+ 实施证据
+
+
+
+
+ <#list regulate_table as table5>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.serial_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.related_shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_measure}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_controlMode}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_controlType}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_frequency}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table5.shape_controlEvidence}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+ .
+
+
+
+
+
+
+ 流程步骤的量化指标
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 指标编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 指标名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 指标值
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计算公式
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计算比例
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计算频率
+
+
+
+
+ <#list KPI_table as table3>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.serial_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_target_value}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_calculation_method}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_calculation_proportion}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_calculation_frequency}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4. 附件
+
+
+
+ <#list file_table as table4>
+
+
+
+
+
+
+
+
+
+ ${table4.file_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+ .
+
+
+
+
+
+
+ 版本修改履历
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改内容
+
+
+
+
+ <#list history_table as table6>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table6.history_no}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 名称：${table6.history_reposiotryName}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 版本号：${table6.history_version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修订人：${table6.history_modifyUser}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修订日期：${table6.history_modifyDate}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table6.history_modifyContent}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc
index 195fe057..5c7dd00a 100644
Binary files a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc and b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.doc differ
diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml
index 2857f473..41484c68 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml
+++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml
@@ -6990,7 +6990,7 @@ y7fdOgAAAABJRU5ErkJggk==
- shape_name
+ ${pl_Process_performance_metrics}
@@ -7578,7 +7578,6 @@ y7fdOgAAAABJRU5ErkJggk==
-
@@ -7586,7 +7585,7 @@ y7fdOgAAAABJRU5ErkJggk==
- 《内部控制矩阵》
+ 序号
diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
index d5c45847..3672c45d 100644
Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ
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 ea7d24bb..6bf7515c 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
@@ -634,7 +634,6 @@ public class ProcessPublishWeb extends ActionWeb {
bo.set("APPLYDATE", new Date());
bo.set("SAVESTATUS", 1);//流程实例状态
SDK.getBOAPI().create(PublisherConstant.BOTABLENAME, bo, processInstModel, _uc);
-
ProcessExecuteQuery execquery = SDK.getProcessAPI().start(processInstModel);
List tracks = execquery.fetch();
TaskInstance userTaskInst = null;
diff --git a/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.xml
index 4a601e7e..834f0cc6 100644
--- a/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.xml
@@ -48,13 +48,9 @@
- 风险控制 - 制度条款
- 风险控制- 风险
- 风险控制 - 控制
- -->
-
-
-
-
-
-
-
-
+ -->
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
index 6a951bc5..2f3ee385 100644
--- a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
@@ -1,29 +1,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.xml
index 73726a88..42bccf62 100644
--- a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.xml
@@ -36,9 +36,5 @@
scope 应用范围（methodId、methodId.shapeId），多个用逗号隔开%代表文件属性 *代表对所有的图形有效，不是文件属性
- 组织-执行部门
-->
-
-
-
-
-
+
diff --git a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
index 3c5e2dd0..12b13476 100644
--- a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml
@@ -3,17 +3,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.xml
index afc1551b..9df0d9b9 100644
--- a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.xml
+++ b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.xml
@@ -36,9 +36,6 @@
适用范围
scope 应用范围（methodId、methodId.shapeId），多个用逗号隔开%代表文件属性 *代表对所有的图形有效，不是文件属性
- 组织-执行部门
- -->
-
-
-
-
+ -->
+
diff --git a/com.actionsoft.apps.coe.pal/method/itsystem.normal/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/itsystem.normal/diagram.attribute.custom.xml
index f3da8756..05d30ccc 100644
--- a/com.actionsoft.apps.coe.pal/method/itsystem.normal/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/itsystem.normal/diagram.attribute.custom.xml
@@ -2,5 +2,8 @@
-
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.bpmn2/diagram.attribute.custom.xml_bak b/com.actionsoft.apps.coe.pal/method/process.bpmn2/diagram.attribute.custom.xml_bak
new file mode 100644
index 00000000..798004a7
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.bpmn2/diagram.attribute.custom.xml_bak
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml
index 4956fecb..8f5eac2f 100644
--- a/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml
@@ -1,5 +1,7 @@
-
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml_bak b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml_bak
new file mode 100644
index 00000000..4bc4bdb9
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.custom.xml_bak
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.xml b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.xml
index 71d90b5d..3c941fb0 100644
--- a/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.xml
+++ b/com.actionsoft.apps.coe.pal/method/process.evc/diagram.attribute.xml
@@ -62,27 +62,7 @@
scope 应用范围（methodId、methodId.shapeId）,多个用逗号隔开%代表文件属性 *代表对所有的图形有效，不是文件属性
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/com.actionsoft.apps.coe.pal/method/shape.map.tpl b/com.actionsoft.apps.coe.pal/method/shape.map.tpl
index e69de29b..9e26dfee 100644
--- a/com.actionsoft.apps.coe.pal/method/shape.map.tpl
+++ b/com.actionsoft.apps.coe.pal/method/shape.map.tpl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.custom.xml b/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.custom.xml
new file mode 100644
index 00000000..209be568
--- /dev/null
+++ b/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.custom.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.xml b/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.xml
index 510dafa3..cfb29330 100644
--- a/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.xml
+++ b/com.awspaas.user.apps.coe.method.process.framework/method/process.framework/diagram.attribute.xml
@@ -64,6 +64,6 @@
- 流程分析-执行频率
- 绩效-流程绩效
- -->
-
+ -->
+
diff --git a/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml b/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml
index 053dfccd..c051907f 100644
--- a/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml
+++ b/com.awspaas.user.apps.coe.pal.output.bd/manifest.xml
@@ -3,7 +3,7 @@
表单手册
1.0
- 3
+ 3
AWSPaaS-EndUser
false
diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java
index 057bef17..4764c7e3 100644
--- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java
+++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java
@@ -107,7 +107,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator() {
@Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
- return o2.getVersion() - o1.getVersion();
+ return (int) (o2.getVersion() - o1.getVersion());
}
});
if (versions == null) {
diff --git a/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml b/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml
index 7fe5ff3e..088b77cd 100644
--- a/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml
+++ b/com.awspaas.user.apps.coe.pal.output.zd/manifest.xml
@@ -3,7 +3,7 @@
制度手册
1.0
- 2
+ 3
AWSPaaS-EndUser
false
diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java
index 3ce4aa9a..6dd15261 100644
--- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java
+++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java
@@ -107,7 +107,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator() {
@Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
- return o2.getVersion() - o1.getVersion();
+ return (int) (o2.getVersion() - o1.getVersion());
}
});
if (versions == null) {