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 cdcec41d..cd45e7ff 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
@@ -556,14 +556,17 @@ public class Report1Gener {
_criticalControlPointTr.put("controlDesc",jsonAttrValue);
}
if("activity_number".equals(jsonAttrId)){
- _criticalControlPointTr.put("activity_number",jsonAttrValue);
+ _criticalControlPointTr.put("activity_number",specialCharTransfer(jsonAttrValue).replace("\n", WRAPSTRING));
}
if("mappingRiskDescription".equals(jsonAttrId)){
- _criticalControlPointTr.put("mappingRiskDescription",jsonAttrValue);
+ _criticalControlPointTr.put("mappingRiskDescription",specialCharTransfer(jsonAttrValue).replace("\n", WRAPSTRING));
}
if("role".equals(jsonAttrId)){
_criticalControlPointTr.put("role",jsonAttrValue);
}
+ if("post".equals(jsonAttrId)){
+ _criticalControlPointTr.put("post",jsonAttrValue);
+ }
}
}
}
@@ -665,10 +668,10 @@ public class Report1Gener {
if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
for (PALRepositoryPropertyModel palRepositoryPropertyModel : repositoryPropertyList) {
JSONObject _process_tr = new JSONObject();
- if(palRepositoryPropertyModel.getPropertyId().equals("lead_process")){//上游流程
+ if(palRepositoryPropertyModel.getPropertyId().equals("lead_process") && UtilString.isNotEmpty(JSONObject.parseObject(palRepositoryPropertyModel.getPropertyValue()).getString("relationShapeText"))){//上游流程
_process_tr.put("name",JSONObject.parseObject(palRepositoryPropertyModel.getPropertyValue()).getString("relationShapeText"));
_process_tr.put("type","上游流程");
- }else if(palRepositoryPropertyModel.getPropertyId().equals("rear_process")){//下游流程
+ }else if(palRepositoryPropertyModel.getPropertyId().equals("rear_process") && UtilString.isNotEmpty(JSONObject.parseObject(palRepositoryPropertyModel.getPropertyValue()).getString("relationShapeText"))){//下游流程
_process_tr.put("name",JSONObject.parseObject(palRepositoryPropertyModel.getPropertyValue()).getString("relationShapeText"));
_process_tr.put("type","下游流程");
}
diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml
index cd3233fa..9f50d7ba 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml
+++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml
@@ -4562,7 +4562,7 @@ y7fdOgAAAABJRU5ErkJggk==
- 角色
+ 角色/岗位
@@ -5145,269 +5145,274 @@ y7fdOgAAAABJRU5ErkJggk==
<#if (roleMappingPostTableCount ==0 )>
<#else>
-
+
-
-
-
-
-
+
+
+
+
+
-
- 角色岗位对应表
+
+
+
+
+
+ 角色岗位对应表
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 序号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 角色
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 岗位
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 角色
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 岗位
+
+
+
<#list roleMappingPostTable as table3>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${table3.shape_number}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${table3.roleMapping_role}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${table3.roleMapping_post}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.shape_number}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.roleMapping_role}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${table3.roleMapping_post}
+
+
+
@@ -6690,7 +6695,7 @@ y7fdOgAAAABJRU5ErkJggk==
-
+
@@ -7069,6 +7074,9 @@ y7fdOgAAAABJRU5ErkJggk==
+ <#if (table4.role == '' )>
+ ${table4.post}
+ <#else>
${table4.role}