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 f38d98c9..a4bbea22 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/util/PrReportComment.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java index 0c902109..23d62c1f 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java @@ -27,10 +27,15 @@ import com.actionsoft.sdk.local.SDK; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer; + public class PrReportComment { public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart,process.framework"; public static String PROCESS_STEP = "userTask,serviceTask,manualTask,receiveTask,sendTask,scriptTask,businessRuleTask,callActivityCallingProcess,method,process,predefinedProcess,decision"; + //word换行符 + private final String WRAPSTRING = ""; + /** * 获取报告公共数据 * com.alibaba.fastjson @@ -306,9 +311,10 @@ public class PrReportComment { } } dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); - }else { + }else if("application".equals(propertyObj.getString("key"))){ + dataMap.put("pl_" + propertyObj.getString("key"), value.replace("\n", WRAPSTRING)); + }else{ dataMap.put("pl_" + propertyObj.getString("key"), value); - } }