diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index 2186fd16..cb973ca4 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ 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 b197a9e2..8b2e625a 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 @@ -320,10 +320,10 @@ public class Report1Gener { int dangerIndex = 1;// 风险序号 int regulateIndex = 1;// 控制序号 for (Map shape : repositoryFileElements) { - //如果图形元素不是流程步骤,不导出该元素 -// if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) { -// continue; -// } + //过滤导出的图形类型 + if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4".indexOf((String)shape.get("type")) == -1) { + continue; + } JSONObject _tr = new JSONObject(); OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值 _tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号 diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java index fbc4bd13..de0a8d5b 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java @@ -299,10 +299,10 @@ public class Report2Gener { int dangerIndex = 1;// 风险序号 int regulateIndex = 1;// 控制序号 for (Map shape : repositoryFileElements) { - //如果图形元素不是流程步骤,不导出该元素 -// if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) { -// continue; -// } + //过滤导出的图形类型 + if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4".indexOf((String)shape.get("type")) == -1) { + continue; + } JSONObject _tr = new JSONObject(); OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值 _tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号