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-08-13 08:45:04 +08:00
parent 741259e242
commit 249433695a
4 changed files with 152 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.actionsoft.apps.coe.pal.output.pr.report1;
import java.io.File;
import java.sql.Timestamp;
import java.util.*;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@ -33,6 +34,7 @@ import com.actionsoft.bpms.server.DispatcherRequest;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.server.fs.DCContext;
import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
import com.actionsoft.bpms.util.UtilDate;
import com.actionsoft.bpms.util.UtilFile;
import com.actionsoft.bpms.util.UtilString;
import com.actionsoft.sdk.local.SDK;
@ -506,6 +508,9 @@ public class Report1Gener {
}
}
// 修订记录
dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel));
//术语
dataMap.put("term_table", termTable);//table4
dataMap.put("term_table_count", termTable.size());//table4
@ -535,6 +540,67 @@ public class Report1Gener {
return dataMap;
}
/**
* 修订记录
* @param repositoryModel
* @return
*/
private JSONArray getVersionHistoryTable(PALRepositoryModel repositoryModel) {
JSONArray versionHistoryTable = new JSONArray();// 修订记录
List<PALRepositoryModel> list = PALRepositoryCache.getByVersionId(repositoryModel.getVersionId());
list.sort((m1, m2)-> {
return m1.getVersion() - m2.getVersion() > 0 ? 1 : -1;
});
for (PALRepositoryModel model : list) {
JSONObject obj = new JSONObject();
Map<String, JSONObject> map = PALRepositoryQueryAPIManager.queryRepositoryAttributeById(model.getId());
// 版本P_versions
String attr = "P_versions";
String val = "";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订单位Issuing_department
attr = "Issuing_department";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订人Drafted_and_revised_by
attr = "Drafted_and_revised_by";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订日期Drafted_and_revised_date
attr = "Drafted_and_revised_date";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
if (UtilString.isNotEmpty(val)) {
try {
Timestamp timestamp = UtilDate.parseTsFromDateTime(val);
val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日";
} catch (Exception e) {
e.printStackTrace();
}
}
obj.put(attr, val);
// 审核人auditor
attr = "auditor";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 复核人reviewer
attr = "reviewer";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 审批人approver
attr = "approver";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 修订内容及理由Contents_and_reasons_for_revision
attr = "Contents_and_reasons_for_revision";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
versionHistoryTable.add(obj);
}
return versionHistoryTable;
}
/**
* 设置风险控制表格
* @param attrId

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

@ -1,6 +1,7 @@
package com.actionsoft.apps.coe.pal.output.pr.report2;
import java.io.File;
import java.sql.Timestamp;
import java.util.*;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@ -30,6 +31,7 @@ import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
import com.actionsoft.bpms.server.DispatcherRequest;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
import com.actionsoft.bpms.util.UtilDate;
import com.actionsoft.bpms.util.UtilFile;
import com.actionsoft.bpms.util.UtilString;
import com.actionsoft.sdk.local.SDK;
@ -485,6 +487,9 @@ public class Report2Gener {
}
}
// 修订记录
dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel));
//术语
dataMap.put("term_table", termTable);//table4
dataMap.put("term_table_count", termTable.size());//table4
@ -751,4 +756,65 @@ public class Report2Gener {
}
/**
* 修订记录
* @param repositoryModel
* @return
*/
private JSONArray getVersionHistoryTable(PALRepositoryModel repositoryModel) {
JSONArray versionHistoryTable = new JSONArray();// 修订记录
List<PALRepositoryModel> list = PALRepositoryCache.getByVersionId(repositoryModel.getVersionId());
list.sort((m1, m2)-> {
return m1.getVersion() - m2.getVersion() > 0 ? 1 : -1;
});
for (PALRepositoryModel model : list) {
JSONObject obj = new JSONObject();
Map<String, JSONObject> map = PALRepositoryQueryAPIManager.queryRepositoryAttributeById(model.getId());
// 版本P_versions
String attr = "P_versions";
String val = "";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订单位Issuing_department
attr = "Issuing_department";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订人Drafted_and_revised_by
attr = "Drafted_and_revised_by";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订日期Drafted_and_revised_date
attr = "Drafted_and_revised_date";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
if (UtilString.isNotEmpty(val)) {
try {
Timestamp timestamp = UtilDate.parseTsFromDateTime(val);
val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日";
} catch (Exception e) {
e.printStackTrace();
}
}
obj.put(attr, val);
// 审核人auditor
attr = "auditor";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 复核人reviewer
attr = "reviewer";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 审批人approver
attr = "approver";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 修订内容及理由Contents_and_reasons_for_revision
attr = "Contents_and_reasons_for_revision";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
versionHistoryTable.add(obj);
}
return versionHistoryTable;
}
}

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

@ -4284,6 +4284,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:p>
</w:tc>
</w:tr>
<#list version_history_table as table8>
<w:tr wsp:rsidR="00000000">
<w:trPr>
<w:trHeight w:val="808"/>
@ -4308,7 +4309,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_P_versions}</w:t>
<w:t>${table8.P_versions}</w:t>
</w:r>
<w:proofErr w:type="gramEnd"/>
</w:p>
@ -4333,7 +4334,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_Issuing_department}</w:t>
<w:t>${table8.Issuing_department}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4360,7 +4361,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_by}</w:t>
<w:t>${table8.Drafted_and_revised_by}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4387,7 +4388,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_date}</w:t>
<w:t>${table8.Drafted_and_revised_date}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4414,7 +4415,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_auditor}</w:t>
<w:t>${table8.auditor}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4433,7 +4434,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_reviewer}</w:t>
<w:t>${table8.reviewer}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4452,7 +4453,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_approver}</w:t>
<w:t>${table8.approver}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4475,11 +4476,12 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_Contents_and_reasons_for_revision}</w:t>
<w:t>${table8.Contents_and_reasons_for_revision}</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#list>
</w:tbl>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
<w:pPr>

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

@ -4190,6 +4190,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:p>
</w:tc>
</w:tr>
<#list version_history_table as table8>
<w:tr wsp:rsidR="00000000">
<w:trPr>
<w:trHeight w:val="808"/>
@ -4214,7 +4215,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_P_versions}</w:t>
<w:t>${table8.P_versions}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4238,7 +4239,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_Issuing_department}</w:t>
<w:t>${table8.Issuing_department}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4265,7 +4266,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_by}</w:t>
<w:t>${table8.Drafted_and_revised_by}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4292,7 +4293,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_date}</w:t>
<w:t>${table8.Drafted_and_revised_date}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4319,7 +4320,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_auditor}</w:t>
<w:t>${table8.auditor}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4338,7 +4339,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_reviewer}</w:t>
<w:t>${table8.reviewer}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4357,7 +4358,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_approver}</w:t>
<w:t>${table8.approver}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4380,11 +4381,12 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r>
<w:t>${pl_Contents_and_reasons_for_revision}</w:t>
<w:t>${table8.Contents_and_reasons_for_revision}</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#list>
</w:tbl>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
<w:pPr>