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 cb973ca4..524ebb16 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 8b2e625a..10cd3aa2 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
@@ -57,6 +57,9 @@ public class Report1Gener {
public static final Object _lock = new Object();
private UserContext userContext = null;
GenerLogExd log = new GenerLogExd();
+ //word换行符
+ private final String WRAPSTRING = "";
+
public Report1Gener() {
}
@@ -328,7 +331,7 @@ public class Report1Gener {
OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值
_tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号
_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", ""))); //流程名称
- _tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING)); //步骤名称
+ _tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", WRAPSTRING)); //步骤名称
/**序号改为流程编号**/
/*_tr.put(OutputWordUtil.SERIAL_NUMBER, ""); //序号置空
@@ -384,19 +387,19 @@ public class Report1Gener {
JSONObject obj = dataAttributes.getJSONObject(i);
String attrId = obj.getString("key");
String attrValue = obj.getString("value");
- _tr.put("shape_" + attrId, attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_" + attrId, attrValue.replace("\n", WRAPSTRING));
if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
if ("bpm_duty_r".equals(attrId)) {
- _tr.put("shape_duty_r", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_duty_r", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_approval_a".equals(attrId)) {
- _tr.put("shape_approval_a", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_approval_a", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_counselor_c".equals(attrId)) {
- _tr.put("shape_counselor_c", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_counselor_c", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_notify_i".equals(attrId)) {
- _tr.put("shape_notify_i", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_notify_i", attrValue.replace("\n", WRAPSTRING));
}
}
if ("danger".equals(attrId)) {
@@ -587,7 +590,7 @@ public class Report1Gener {
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
- _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
@@ -647,7 +650,7 @@ public class Report1Gener {
JSONObject _tr = new JSONObject();
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
- _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n",WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
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 de0a8d5b..1b2c48c6 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
@@ -55,6 +55,9 @@ public class Report2Gener {
public static final Object _lock = new Object();
private UserContext userContext = null;
GenerLogExd log = new GenerLogExd();
+ //word换行符
+ private final String WRAPSTRING = "";
+
public Report2Gener() {
}
@@ -307,7 +310,7 @@ public class Report2Gener {
OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值
_tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号
_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", ""))); //流程名称
- _tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING)); //步骤名称
+ _tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", WRAPSTRING)); //步骤名称
/**序号改为流程编号**/
/*_tr.put(OutputWordUtil.SERIAL_NUMBER, ""); //序号置空
@@ -363,19 +366,19 @@ public class Report2Gener {
JSONObject obj = dataAttributes.getJSONObject(i);
String attrId = obj.getString("key");
String attrValue = obj.getString("value");
- _tr.put("shape_" + attrId, attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_" + attrId, attrValue.replace("\n", WRAPSTRING));
if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
if ("bpm_duty_r".equals(attrId)) {
- _tr.put("shape_duty_r", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_duty_r", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_approval_a".equals(attrId)) {
- _tr.put("shape_approval_a", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_approval_a", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_counselor_c".equals(attrId)) {
- _tr.put("shape_counselor_c", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_counselor_c", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_notify_i".equals(attrId)) {
- _tr.put("shape_notify_i", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put("shape_notify_i", attrValue.replace("\n", WRAPSTRING));
}
}
if ("danger".equals(attrId)) {
@@ -566,7 +569,7 @@ public class Report2Gener {
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
- _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
@@ -618,9 +621,9 @@ public class Report2Gener {
if (id.equals(relationShapeId)) {
String type = element.get("type").toString();
if ("organization".equals(type)) {
- orgList.add(element.get("text").toString().replace("\n", OutputWordUtil.WRAPSTRING));
+ orgList.add(element.get("text").toString().replace("\n", WRAPSTRING));
} else if ("position".equals(type) || "role".equals(type)) {
- roleList.add(element.get("text").toString().replace("\n", OutputWordUtil.WRAPSTRING));
+ roleList.add(element.get("text").toString().replace("\n", WRAPSTRING));
}
}
}
@@ -676,7 +679,7 @@ public class Report2Gener {
JSONObject _tr = new JSONObject();
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
- _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
@@ -735,7 +738,7 @@ public class Report2Gener {
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
- _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+ _tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {