diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 5cd1b5a9..f6dcd971 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index a7b89b0b..848e2d85 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -769,6 +769,9 @@ public class OutputWordUtil { } } + + Paragraph paragraph_blank = section.addParagraph(); + } @@ -875,7 +878,7 @@ public class OutputWordUtil { } } - + Paragraph paragraph_blank = section.addParagraph(); } @@ -961,7 +964,7 @@ public class OutputWordUtil { dataRow.getCells().get(c).addParagraph().appendText(data[r][c]); } } - + Paragraph paragraph_blank = section.addParagraph(); } //查询模型文件属性上传附件信息 @@ -1034,7 +1037,7 @@ public class OutputWordUtil { if (suffix.equals(".doc") || suffix.equals(".docx")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/word.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".doc")) { paragraph5.appendOleObject(stream1, pic1, "doc"); } else if (suffix.equals(".docx")) { @@ -1042,11 +1045,11 @@ public class OutputWordUtil { } } else if (suffix.equals(".pdf")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/pdf.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); paragraph5.appendOleObject(stream1, pic1, "pdf"); } else if (suffix.equals(".xls") || suffix.equals(".xlsx")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/xls.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".xls")) { paragraph5.appendOleObject(stream1, pic1, "xls"); } else if (suffix.equals(".xlsx")) { @@ -1054,7 +1057,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".png") || suffix.equals(".jgp")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/png.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".png")) { paragraph5.appendOleObject(stream1, pic1, "png"); } else if (suffix.equals(".jpg")) { @@ -1062,7 +1065,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".zip") || suffix.equals(".rar")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/zip.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".zip")) { paragraph5.appendOleObject(stream1, pic1, "zip"); } else if (suffix.equals(".rar")) { @@ -1070,7 +1073,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".mp3") || suffix.equals(".mp4")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/mp3.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".mp3")) { paragraph5.appendOleObject(stream1, pic1, "mp3"); } else if (suffix.equals(".mp4")) { @@ -1078,7 +1081,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".ppt") || suffix.equals(".pptx")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/ppt.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".ppt")) { paragraph5.appendOleObject(stream1, pic1, "ppt"); } else if (suffix.equals(".pptx")) { @@ -1086,7 +1089,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".txt")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/txt.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); paragraph5.appendOleObject(stream1, pic1, "txt"); } @@ -1301,7 +1304,7 @@ public class OutputWordUtil { if (suffix.equals(".doc") || suffix.equals(".docx")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/word.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".doc")) { paragraph5.appendOleObject(stream1, pic1, "doc"); } else if (suffix.equals(".docx")) { @@ -1309,11 +1312,11 @@ public class OutputWordUtil { } } else if (suffix.equals(".pdf")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/pdf.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); paragraph5.appendOleObject(stream1, pic1, "pdf"); } else if (suffix.equals(".xls") || suffix.equals(".xlsx")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/xls.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".xls")) { paragraph5.appendOleObject(stream1, pic1, "xls"); } else if (suffix.equals(".xlsx")) { @@ -1321,7 +1324,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".png") || suffix.equals(".jgp")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/png.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".png")) { paragraph5.appendOleObject(stream1, pic1, "png"); } else if (suffix.equals(".jpg")) { @@ -1329,7 +1332,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".zip") || suffix.equals(".rar")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/zip.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".zip")) { paragraph5.appendOleObject(stream1, pic1, "zip"); } else if (suffix.equals(".rar")) { @@ -1337,7 +1340,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".mp3") || suffix.equals(".mp4")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/mp3.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); if (suffix.equals(".mp3")) { paragraph5.appendOleObject(stream1, pic1, "mp3"); } else if (suffix.equals(".mp4")) { @@ -1345,7 +1348,7 @@ public class OutputWordUtil { } } else if (suffix.equals(".txt")) { pic1.loadImage("../doccenter/com.awspaas.user.apps.coe.pal.output.zd/filepic/txt.png"); - paragraph5.appendText(dcContextModel.getFileName()); + paragraph5.appendText(dcContextModel.getFileName()+" "); paragraph5.appendOleObject(stream1, pic1, "txt"); }