diff --git a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar index 01ac2e14..d3757b00 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar and b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index 2e5d6f3f..fbfebcbc 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -1,6 +1,7 @@ package com.awspaas.apps.coe.pal.output.bd.report1; import java.io.File; +import java.io.FileNotFoundException; import java.sql.Timestamp; import java.util.*; import com.actionsoft.apps.coe.pal.constant.CoEConstant; @@ -98,6 +99,8 @@ public class Report1Gener { genarateWord(tempPath, tempName, dcContext.getPath(), jsonObj); log.info("end"); // } + } catch (FileNotFoundException e) { + e.printStackTrace(); } finally { // isRunning = false; } @@ -111,7 +114,7 @@ public class Report1Gener { * @param docPath * @param wizardJsonData */ - private void genarateWord(String tempPath, String tempName, String docPath, JSONObject wizardJsonData) { + private void genarateWord(String tempPath, String tempName, String docPath, JSONObject wizardJsonData) throws FileNotFoundException { String[] repositoryIds = wizardJsonData.getString("targetFileId").split(","); String reportName = wizardJsonData.getString("reportNameIsItName"); //页面上设计的文件命名规则 @@ -180,7 +183,7 @@ public class Report1Gener { } JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName); if (dataMap != null) { - OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName); + OutputWordUtil.createBdDoc2(dataMap, tempPath, tempName, docName,repositoryId); } } } @@ -297,7 +300,7 @@ public class Report1Gener { /**序号改为流程编号**/ // 节点的附件处理 - boolean isNumberAsc = false; + /*boolean isNumberAsc = false; JSONArray shapeFileTable = new JSONArray(); //流程节点附件Table if (search != null && search.size() > 0) { // 复制附件 @@ -362,7 +365,7 @@ public class Report1Gener { object.put("shape_file_link", ""); shapeFileTable.add(object); } - _tr.put("shape_File_Table", shapeFileTable); + _tr.put("shape_File_Table", shapeFileTable);*/ JSONArray dataAttributes = (JSONArray) shape.get("attributes"); if (!dataAttributes.isEmpty()) { diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml index a070145d..c6f56db2 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册2.xml @@ -3595,7 +3595,7 @@ y7fdOgAAAABJRU5ErkJggk== - + + + + + + + + + diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 4fe3bb22..02795953 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -92,7 +92,7 @@ public class Report1Gener { * @see PlatformAPIImpl#getDefaultLanguage() * @see PlatformAPIImpl#getlanguages() */ - public ResponseObject execute(OutputTaskModel model, String wizardJsonData, DCContext dcContext) { + public ResponseObject execute(OutputTaskModel model, String wizardJsonData, DCContext dcContext) throws FileNotFoundException { try { // synchronized (_lock) { // isRunning = true; @@ -129,7 +129,7 @@ public class Report1Gener { * @param docPath * @param wizardJsonData */ - private void genarateWord(String tempPath, String tempName, String docPath, JSONObject wizardJsonData) { + private void genarateWord(String tempPath, String tempName, String docPath, JSONObject wizardJsonData) throws FileNotFoundException { String[] repositoryIds = wizardJsonData.getString("targetFileId").split(","); String reportName = wizardJsonData.getString("reportNameIsItName"); //页面上设计的文件命名规则 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册5.xml b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册5.xml index 27c8ce5a..02c7dd22 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册5.xml +++ b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册5.xml @@ -2755,7 +2755,7 @@ - + @@ -2832,7 +2832,7 @@ - + @@ -2913,7 +2913,7 @@ - + @@ -3919,7 +3919,6 @@ y7fdOgAAAABJRU5ErkJggk== - $ @@ -3930,7 +3929,7 @@ y7fdOgAAAABJRU5ErkJggk== - {pl_Process_Architecture_L2} + ${pl_Process_Architecture_L2} @@ -4145,7 +4144,6 @@ y7fdOgAAAABJRU5ErkJggk== - $ @@ -4156,7 +4154,7 @@ y7fdOgAAAABJRU5ErkJggk== - {pl_Process_Architecture_L3} + ${pl_Process_Architecture_L3} @@ -4380,7 +4378,7 @@ y7fdOgAAAABJRU5ErkJggk== - + +