报告生成器 表单手册生成调整
This commit is contained in:
parent
8a552d6ff6
commit
ad98fbdf69
Binary file not shown.
Binary file not shown.
@ -221,15 +221,47 @@ public class Report1Gener {
|
||||
file.mkdir();
|
||||
}
|
||||
}
|
||||
|
||||
//文件属性附件
|
||||
int fileIndex = 1;
|
||||
if (search != null && search.size() > 0) {
|
||||
// 复制附件
|
||||
for (UpfileModel upfileModel : search) {
|
||||
if (!"f".equals(upfileModel.getType())) {// 文件
|
||||
continue;
|
||||
}
|
||||
// 复制doccenter下的文件
|
||||
DCContext dcContext = null;
|
||||
DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
|
||||
if (dcProfile != null) {
|
||||
dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
|
||||
}
|
||||
File sourceFile = new UtilFile(dcContext.getFilePath());
|
||||
File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
|
||||
try {
|
||||
UtilFile.copyFile(sourceFile, targetFile);
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("file_name", fileIndex + "." + upfileModel.getFileName());
|
||||
String link = fileName + File.separator + upfileModel.getFileName();
|
||||
object.put("link", link);
|
||||
fileTable.add(object);
|
||||
fileIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
if (repositoryFileElements != null) {
|
||||
int index = 1;// 流程步骤序号
|
||||
int dangerIndex = 1;// 风险序号
|
||||
int regulateIndex = 1;// 控制序号
|
||||
for (Map<String, Object> shape : repositoryFileElements) {
|
||||
//如果图形元素不是流程步骤,不导出该元素
|
||||
if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1) {
|
||||
continue;
|
||||
}
|
||||
// if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1) {
|
||||
// continue;
|
||||
// }
|
||||
JSONObject _tr = new JSONObject();
|
||||
OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值
|
||||
_tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号
|
||||
@ -269,10 +301,11 @@ public class Report1Gener {
|
||||
e.printStackTrace();
|
||||
}
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("shape_file_name", upfileModel.getFileName());
|
||||
object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName());
|
||||
String link = fileName + File.separator + upfileModel.getFileName();
|
||||
object.put("shape_file_link", link);
|
||||
shapeFileTable.add(object);
|
||||
fileIndex++;
|
||||
}
|
||||
}
|
||||
if(shapeFileTable.size() == 0) {// 没有附件时给空值,不然使用office打开会解析错误
|
||||
@ -321,36 +354,6 @@ public class Report1Gener {
|
||||
// 流程步骤的指标表格
|
||||
setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
|
||||
|
||||
if (search != null && search.size() > 0) {
|
||||
// 复制附件
|
||||
int index = 1;
|
||||
for (UpfileModel upfileModel : search) {
|
||||
if (!"f".equals(upfileModel.getType())) {// 文件
|
||||
continue;
|
||||
}
|
||||
// 复制doccenter下的文件
|
||||
DCContext dcContext = null;
|
||||
DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
|
||||
if (dcProfile != null) {
|
||||
dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
|
||||
}
|
||||
File sourceFile = new UtilFile(dcContext.getFilePath());
|
||||
File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
|
||||
try {
|
||||
UtilFile.copyFile(sourceFile, targetFile);
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("file_name", index + "." + upfileModel.getFileName());
|
||||
String link = fileName + File.separator + upfileModel.getFileName();
|
||||
object.put("link", link);
|
||||
fileTable.add(object);
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
|
||||
dataMap.put("file_table", fileTable);
|
||||
dataMap.put("file_table_count", fileTable.size());
|
||||
|
||||
@ -4411,6 +4411,7 @@ y7fdOgAAAABJRU5ErkJggk==
|
||||
<w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D">
|
||||
<w:rPr>
|
||||
<w:rStyle w:val="a4"/>
|
||||
<w:color w:val="2440b3"/>
|
||||
</w:rPr>
|
||||
<w:t>${table4.file_name}</w:t>
|
||||
</w:r>
|
||||
@ -4418,33 +4419,34 @@ y7fdOgAAAABJRU5ErkJggk==
|
||||
</w:p>
|
||||
</#list>
|
||||
<#list repository_shape_table as table1>
|
||||
<#list table1.shape_File_Table as table11>
|
||||
<w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
|
||||
<w:pPr>
|
||||
<w:pStyle w:val="p0"/>
|
||||
<w:rPr>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:color w:val="000000"/>
|
||||
<w:sz w:val="22"/>
|
||||
<w:sz-cs w:val="20"/>
|
||||
</w:rPr>
|
||||
</w:pPr>
|
||||
<w:hlink w:dest="${table11.shape_file_link}">
|
||||
<w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
|
||||
<w:rPr>
|
||||
<w:rStyle w:val="a4"/>
|
||||
<w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>
|
||||
<wx:font wx:val="宋体"/>
|
||||
<w:sz w:val="22"/>
|
||||
<w:sz-cs w:val="20"/>
|
||||
</w:rPr>
|
||||
<w:t>${table11.shape_file_name}</w:t>
|
||||
</w:r>
|
||||
</w:hlink>
|
||||
</w:p>
|
||||
</#list>
|
||||
</#list>
|
||||
<#list table1.shape_File_Table as table11>
|
||||
<w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
|
||||
<w:pPr>
|
||||
<!-- <w:pStyle w:val="p0"/>-->
|
||||
<!-- <w:rPr>-->
|
||||
<!-- <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>-->
|
||||
<!-- <wx:font wx:val="宋体"/>-->
|
||||
<!-- <w:color w:val="000000"/>-->
|
||||
<!-- <w:sz w:val="22"/>-->
|
||||
<!-- <w:sz-cs w:val="20"/>-->
|
||||
<!-- </w:rPr>-->
|
||||
</w:pPr>
|
||||
<w:hlink w:dest="${table11.shape_file_link}">
|
||||
<w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
|
||||
<w:rPr>
|
||||
<w:rStyle w:val="a4"/>
|
||||
<w:color w:val="2440b3"/>
|
||||
<!-- <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>-->
|
||||
<!-- <wx:font wx:val="宋体"/>-->
|
||||
<!-- <w:sz w:val="22"/>-->
|
||||
<!-- <w:sz-cs w:val="20"/>-->
|
||||
</w:rPr>
|
||||
<w:t>${table11.shape_file_name}</w:t>
|
||||
</w:r>
|
||||
</w:hlink>
|
||||
</w:p>
|
||||
</#list>
|
||||
</#list>
|
||||
<w:p wsp:rsidR="00B739CB" wsp:rsidRDefault="00B739CB">
|
||||
<w:pPr>
|
||||
<w:rPr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user