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 4f2a3486..d1158095 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
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
index 976ad0ee..4a118a49 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
+++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
@@ -88,8 +88,9 @@ public class Report1Gener {
// ----预处理、校验----
OutputAppProfile appModel = OutputAppManager.getProfile(model.getProfileId());
String tempPath = appModel.getAppContext().getPath();
- String tempName = "步骤横表-流程手册2.xml";
- log.info("begin...");
+ //String tempName = "步骤横表-流程手册.xml";
+ String tempName = "步骤横表-流程手册2.xml";
+ log.info("begin...");
log.info("-------------------");
// ----文件处理-----
genarateWord(tempPath, tempName, dcContext.getPath(), jsonObj);
@@ -201,43 +202,45 @@ public class Report1Gener {
dataMap.put("pl_unit_measurement", "");
dataMap.put("pl_statistical_period", "");
dataMap.put("pl_explain", "");
- }
- for (DesignerShapeRelationModel relation : metrics) {
- String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
- String relationShapeId = relation.getRelationShapeId();//实例ID
- System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
- List