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

流程手册导出版本显示问题

Browse Source
This commit is contained in:
zhal 2024-06-14 10:13:05 +08:00
parent d43d929de6
commit 28600f1888
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.output.pr/lib/Spire.Doc.jar Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

@ -151,8 +151,9 @@ public class Report1Gener {
String plver = "";
if (!"".equals(plvers)) {
if (plvers.length() > 1) {
plver = plvers.substring(0, 1) + "."
+ plvers.substring(plvers.length() - 1, plvers.length());
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
} else {
plver = plvers.substring(0, 1) + ".0";
}
@ -680,7 +681,7 @@ public class Report1Gener {
}
}
dataMap.put("T_supplementary_articles_table", T_supplementary_articles_table);// 换行
dataMap.put("T_supplementary_articles_count", T_supplementary_articles_table.size());
// 目的处理
List<String> goal_table = new ArrayList<>();
String [] tmp2 = dataMap.getString("pl_goal").split("\n");
@ -768,8 +769,8 @@ public class Report1Gener {
String plver = "";
if (!"".equals(plvers)) {
if (plvers.length() > 1) {
plver = plvers.substring(0, 1) + "."
+ plvers.substring(plvers.length() - 1, plvers.length());
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
} else {
plver = plvers.substring(0, 1) + ".0";
}

16
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java
View File

@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
public class PrReportComment {
public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart";
public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart,process.scheme";
public static String PROCESS_STEP = "userTask,serviceTask,manualTask,receiveTask,sendTask,scriptTask,businessRuleTask,callActivityCallingProcess,method,process,predefinedProcess,decision";
/**
@ -76,14 +76,11 @@ public class PrReportComment {
date = sb.toString();
}
}
System.out.println("表单数据内容获取1==================");
dataMap.put(OutputWordUtil.PL_VERSION, "V" + repositoryModel.getVersion()+ ".0 " + date); // 版本
OutputWordUtil.setRepositoryDefaultValue2(TARGET_METHOD_SCOPE, dataMap);// 设置属性默认值（空字符串）
System.out.println("表单数据内容获取2==================");
JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId());
System.err.println("====propertyArr=====>"+propertyArr);
for (int i = 0; i < propertyArr.size(); i++) {
JSONObject propertyObj = propertyArr.getJSONObject(i);
String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value"));
@ -105,8 +102,8 @@ public class PrReportComment {
String plver = "";
if (!"".equals(plvers)) {
if (plvers.length() > 1) {
plver = plvers.substring(0, 1) + "."
+ plvers.substring(plvers.length() - 1, plvers.length());
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
} else {
plver = plvers.substring(0, 1) + ".0";
}
@ -117,7 +114,6 @@ public class PrReportComment {
}
}
System.err.println("====dataMap=====>"+dataMap);
// 责任人、责任部门单独处理，兼容流程手册中直接使用pl_key进行定义
boolean dutyRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal.output.pr", "DUTY_DEPARTMENT_PERSON_RELATION_TYPE", false);
String relationPersion = "";
@ -303,8 +299,8 @@ public class PrReportComment {
String plver = "";
if (!"".equals(plvers)) {
if (plvers.length() > 1) {
plver = plvers.substring(0, 1) + "."
+ plvers.substring(plvers.length() - 1, plvers.length());
//plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
plver = plvers.substring(0,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
} else {
plver = plvers.substring(0, 1) + ".0";
}

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

@ -4350,6 +4350,7 @@ y7fdOgAAAABJRU5ErkJggk==
</wx:sub-section>
</wx:sect>
<wx:sect>
<#if (TABLE_REPOSITORY_SHAPE_COUNT >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00AC2941" wsp:rsidRDefault="00AC2941">
<w:pPr>
@ -5233,8 +5234,10 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
</wx:sect>
<wx:sect>
<#if (metrics_count >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00AC2941" wsp:rsidRDefault="00AC2941">
<w:pPr>
@ -5953,6 +5956,8 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
<#if (relevant_table_count >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00AC2941" wsp:rsidRDefault="00AC2941">
<w:pPr>
@ -6173,6 +6178,8 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
<#if (supports_table_count >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00AC2941" wsp:rsidRDefault="00AC2941">
<w:pPr>
@ -6397,6 +6404,8 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
<#if (T_supplementary_articles_count >0)>
<wx:sub-section>
<w:p wsp:rsidR="00140F58" wsp:rsidRPr="00E21AF8" wsp:rsidRDefault="00AC2941" wsp:rsidP="00E21AF8">
<w:pPr>
@ -6449,6 +6458,8 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
<#if (file_table_count >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00546297" wsp:rsidRDefault="00546297" wsp:rsidP="00140F58">
<w:pPr>
@ -6511,6 +6522,7 @@ y7fdOgAAAABJRU5ErkJggk==
</#list>
</#if>
</wx:sub-section>
</#if>
<w:sectPr wsp:rsidR="00140F58" wsp:rsidRPr="00822EA9">
<w:hdr w:type="odd">
<w:tbl>