yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程手册横竖表附件部分调整

Browse Source
This commit is contained in:
446052889@qq.com 2022-09-15 14:08:38 +08:00
parent 6e90ec158f
commit e59a2ac5b5
5 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar
View File

Binary file not shown.

8
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
View File

@ -368,10 +368,10 @@ public class Report1Gener {
e.printStackTrace(); e.printStackTrace();
} }
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName()); object.put("file_name", fileIndex+"."+upfileModel.getFileName());
String link = fileName + File.separator + upfileModel.getFileName(); String link = fileName + File.separator + upfileModel.getFileName();
object.put("shape_file_link", link); object.put("link", link);
shapeFileTable.add(object); fileTable.add(object);
fileIndex++; fileIndex++;
} }
} }
@ -530,7 +530,7 @@ public class Report1Gener {
dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
dataMap.put("file_table", fileTable); dataMap.put("file_table", fileTable);
dataMap.put("file_table_count", fileIndex); dataMap.put("file_table_count", fileTable.size());
dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable); dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable); dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
dataMap.put(OutputWordUtil.TABLE_KPI, KPITable); dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);

8
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java
View File

@ -347,10 +347,10 @@ public class Report2Gener {
e.printStackTrace(); e.printStackTrace();
} }
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName()); object.put("file_name", fileIndex+"."+upfileModel.getFileName());
String link = fileName + File.separator + upfileModel.getFileName(); String link = fileName + File.separator + upfileModel.getFileName();
object.put("shape_file_link", link); object.put("link", link);
shapeFileTable.add(object); fileTable.add(object);
fileIndex++; fileIndex++;
} }
} }
@ -509,7 +509,7 @@ public class Report2Gener {
dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable); dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size()); dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
dataMap.put("file_table", fileTable); dataMap.put("file_table", fileTable);
dataMap.put("file_table_count", fileIndex); dataMap.put("file_table_count", fileTable.size());
dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable); dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable); dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
dataMap.put(OutputWordUtil.TABLE_KPI, KPITable); dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);

25
com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml
View File

@ -7206,7 +7206,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:r> </w:r>
<aml:annotation aml:id="9" w:type="Word.Bookmark.End"/> <aml:annotation aml:id="9" w:type="Word.Bookmark.End"/>
</w:p> </w:p>
<#if (file_table_count == 1 )> <#if (file_table_count == 0 )>
<w:p wsp:rsidR="00140F58" wsp:rsidRDefault="00140F58" wsp:rsidP="00140F58"> <w:p wsp:rsidR="00140F58" wsp:rsidRDefault="00140F58" wsp:rsidP="00140F58">
<w:pPr> <w:pPr>
<w:pStyle w:val="IDSTYLECONTEXTINDENT"/> <w:pStyle w:val="IDSTYLECONTEXTINDENT"/>
@ -7240,29 +7240,6 @@ y7fdOgAAAABJRU5ErkJggk==
</w:hlink> </w:hlink>
</w:p> </w:p>
</#list> </#list>
<#list repository_shape_table as table1>
<#list table1.shape_File_Table as table11>
<w:p wsp:rsidR="00140F58" wsp:rsidRPr="00822EA9" wsp:rsidRDefault="007903C3" wsp:rsidP="00822EA9">
<w:pPr>
<w:pStyle w:val="IDSTYLECONTEXTINDENT"/>
<w:ind w:first-line="0"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
<w:lang w:val="EN-US"/>
</w:rPr>
</w:pPr>
<w:hlink w:dest="${table11.shape_file_link}">
<w:r wsp:rsidR="007A3F31">
<w:rPr>
<w:rStyle w:val="a3"/>
<w:lang w:val="EN-US"/>
</w:rPr>
<w:t>${table11.shape_file_name}</w:t>
</w:r>
</w:hlink>
</w:p>
</#list>
</#list>
</#if> </#if>
</wx:sub-section> </wx:sub-section>
<w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="00822EA9"> <w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="00822EA9">

25
com.actionsoft.apps.coe.pal.output.pr/步骤竖表-流程手册4.xml
View File

@ -6979,7 +6979,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:r> </w:r>
<aml:annotation aml:id="9" w:type="Word.Bookmark.End"/> <aml:annotation aml:id="9" w:type="Word.Bookmark.End"/>
</w:p> </w:p>
<#if (file_table_count == 1 )> <#if (file_table_count == 0 )>
<w:p wsp:rsidR="00140F58" wsp:rsidRPr="000F6912" wsp:rsidRDefault="00140F58" wsp:rsidP="00140F58"> <w:p wsp:rsidR="00140F58" wsp:rsidRPr="000F6912" wsp:rsidRDefault="00140F58" wsp:rsidP="00140F58">
<w:pPr> <w:pPr>
<w:pStyle w:val="IDSTYLECONTEXTINDENT"/> <w:pStyle w:val="IDSTYLECONTEXTINDENT"/>
@ -7013,29 +7013,6 @@ y7fdOgAAAABJRU5ErkJggk==
</w:hlink> </w:hlink>
</w:p> </w:p>
</#list> </#list>
<#list repository_shape_table as table1>
<#list table1.shape_File_Table as table11>
<w:p wsp:rsidR="00140F58" wsp:rsidRPr="000F6912" wsp:rsidRDefault="007903C3" wsp:rsidP="00822EA9">
<w:pPr>
<w:pStyle w:val="IDSTYLECONTEXTINDENT"/>
<w:ind w:first-line="0"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
<w:lang w:val="EN-US"/>
</w:rPr>
</w:pPr>
<w:hlink w:dest="${table11.shape_file_link}">
<w:r wsp:rsidR="002C40B9" wsp:rsidRPr="000F6912">
<w:rPr>
<w:rStyle w:val="a3"/>
<w:lang w:val="EN-US"/>
</w:rPr>
<w:t>${table11.shape_file_name}</w:t>
</w:r>
</w:hlink>
</w:p>
</#list>
</#list>
</#if> </#if>
</wx:sub-section> </wx:sub-section>
<w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="000F6912"> <w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="000F6912">