流程手册附件显示优化
This commit is contained in:
parent
c6baf0e75d
commit
9941779e02
@ -2,10 +2,7 @@ package com.actionsoft.apps.coe.pal.output.pr.report1;
|
|||||||
|
|
||||||
import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer;
|
import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.*;
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
@ -118,6 +115,8 @@ public class Report1Gener {
|
|||||||
OutputWordUtil.xml2Word(log, dcContext.getPath());
|
OutputWordUtil.xml2Word(log, dcContext.getPath());
|
||||||
log.info("end");
|
log.info("end");
|
||||||
// }
|
// }
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
// isRunning = false;
|
// isRunning = false;
|
||||||
}
|
}
|
||||||
@ -131,7 +130,7 @@ public class Report1Gener {
|
|||||||
* @param docPath
|
* @param docPath
|
||||||
* @param wizardJsonData
|
* @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[] repositoryIds = wizardJsonData.getString("targetFileId").split(",");
|
||||||
|
|
||||||
String reportName = wizardJsonData.getString("reportNameIsItName"); //页面上设计的文件命名规则
|
String reportName = wizardJsonData.getString("reportNameIsItName"); //页面上设计的文件命名规则
|
||||||
@ -205,7 +204,7 @@ public class Report1Gener {
|
|||||||
}
|
}
|
||||||
JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName);
|
JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName);
|
||||||
if (dataMap != null) {
|
if (dataMap != null) {
|
||||||
OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName);
|
OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName, repositoryId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -726,7 +725,7 @@ public class Report1Gener {
|
|||||||
if(sb.length()>0){
|
if(sb.length()>0){
|
||||||
sb.deleteCharAt(sb.length() -1);
|
sb.deleteCharAt(sb.length() -1);
|
||||||
_process_tr.put("name",sb.toString());
|
_process_tr.put("name",sb.toString());
|
||||||
_process_tr.put("type","下游流程");
|
_process_tr.put("type","上游流程");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user