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-08-14 15:33:34 +08:00
parent 187c38adb5
commit 82b5b5cdfd
3 changed files with 11 additions and 46 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.

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

@ -642,7 +642,7 @@ public class Report1Gener {
//相关/支持文件
List<DesignerShapeRelationModel> relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files");
relationList.sort(Comparator.comparing(DesignerShapeRelationModel::getShapeText));
@ -669,54 +669,20 @@ public class Report1Gener {
}
}
/*
* List<DesignerShapeRelationModel> relationList =
* DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "",
* "support_files");
* relationList.sort(Comparator.comparing(DesignerShapeRelationModel::
* getShapeText)); int index = 0; for (DesignerShapeRelationModel relation :
* relationList) { String relationFileId = relation.getRelationFileId();//
* 支持或相关文件的ID PALRepositoryModel model =
* PALRepositoryCache.getCache().get(relationFileId); if (model != null) {
* index++; String name = model.getName(); JSONObject tmp = new JSONObject();
* tmp.put("name", name); tmp.put("desc", index);
*
*
* supportfiles.add(tmp); } }
*/
//相关文件 R_relevant_flies
JSONArray relevant_flies = new JSONArray();
try {
//相关文件
/*int count = 0;
String sql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '"+repositoryModel.getId()+"' and PROPERTYID = 'R_relevant_flies'";
String relatFileJson = DBSql.getString(sql);
if(UtilString.isNotEmpty(relatFileJson)) {
JSONObject parseObject = JSONObject.parseObject(relatFileJson);
String fileNames = parseObject.getString("relationShapeText");
String relationFileId=parseObject.getString("relationFileId");
if(UtilString.isNotEmpty(fileNames)) {
String[] names = fileNames.split(",");
for (String name : names) {
count++;
JSONObject tmp = new JSONObject();
tmp.put("name", name);
tmp.put("desc", count);
relevant_flies.add(tmp);
}
}
}*/
/*List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies");
List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies");
relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getShapeText));
relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getShapeText));*/
int count = 0;
if (relationList2.size() > 0) {
/*if (relationList2.size() > 0) {
for (DesignerShapeRelationModel relation : relationList2) {
String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
String name = null;
@ -735,8 +701,7 @@ public class Report1Gener {
relevant_flies.add(tmp);
}
}
}*/
//外部相关文件
String sqlOut = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID = '"+repositoryModel.getId()+"' and PROPERTYID = 'Out_relevant_files'";
@ -823,8 +788,8 @@ public class Report1Gener {
dataMap.put("supports_table", supportfiles);//table6
dataMap.put("supports_table_count", supportfiles.size());//table6
//相关文件
dataMap.put("relevant_table", relevant_flies);//table7
dataMap.put("relevant_table_count", relevant_flies.size());//table7
/*dataMap.put("relevant_table", relevant_flies);//table7
dataMap.put("relevant_table_count", relevant_flies.size());//table7*/
//流程绩效
//dataMap.put("Process_performance_metrics_table",process_performance_metrics);//table8
dataMap.put("metrics_count", metrics.size());//

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

@ -6229,7 +6229,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:p>
</wx:sub-section>
</#if>
<#if (relevant_table_count >0 )>
<!--<#if (relevant_table_count >0 )>
<wx:sub-section>
<w:p wsp:rsidR="00AC2941" wsp:rsidRDefault="00AC2941">
<w:pPr>
@ -6450,7 +6450,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
</w:p>
</wx:sub-section>
</#if>
</#if>-->
<!-- 关键控制点风险矩阵开始 -->
<#if (criticalControlPointTableCount ==0 )>
<#else>
@ -6814,7 +6814,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:pPr>
<aml:annotation aml:id="7" w:type="Word.Bookmark.Start" w:name="_Toc112685147"/>
<w:r>
<w:t>支持文件</w:t>
<w:t>相关/支持文件</w:t>
</w:r>
<aml:annotation aml:id="7" w:type="Word.Bookmark.End"/>
</w:p>