diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index bd90cf26..d87856c1 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -1,12 +1,10 @@ package com.actionsoft.apps.coe.pal.output.pr.report1; import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer; - import java.io.File; import java.sql.Timestamp; import java.util.*; import java.util.stream.Collectors; - import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment; import com.actionsoft.apps.coe.pal.output.pr.util.ReportRepositoryCompare; @@ -33,6 +31,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; +import com.actionsoft.bpms.bo.engine.BO; import com.actionsoft.bpms.bpmn.engine.model.def.ProcessNode; import com.actionsoft.bpms.commons.database.RowMap; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; @@ -553,6 +552,9 @@ public class Report1Gener { if("controlDesc".equals(jsonAttrId)){ _criticalControlPointTr.put("controlDesc",jsonAttrValue); } + if("activity_number".equals(jsonAttrId)){ + _criticalControlPointTr.put("activity_number",jsonAttrValue); + } if("mappingRiskDescription".equals(jsonAttrId)){ _criticalControlPointTr.put("mappingRiskDescription",jsonAttrValue); } @@ -834,6 +836,9 @@ public class Report1Gener { //上下游表格 dataMap.put("procedureTable", procedureTable); dataMap.put("procedureTableCount", procedureTable.size()); + + //增加模版内容替换逻辑 + getReportTempleteInfo(dataMap,userContext); boolean contains = isNumberAscArray.contains("false"); if(contains) { fileTable.sort(Comparator.comparing(obj -> ((JSONObject) obj).getString("file_name"))); @@ -1067,4 +1072,26 @@ public class Report1Gener { } + + /** + * 获取流程模版中的信息内容,做动态的替换逻辑 + * @param dataMap + * @param me + */ + public void getReportTempleteInfo(JSONObject dataMap,UserContext me){ + String deptId = me.getDepartmentModel().getId(); + //先查询模版文件中有无配置模版 + BO bo = SDK.getBOAPI().query("BO_EU_OUTPUT_TEMPLATE", true).addQuery("APPLYDEPTID=", deptId).detail(); + if(null!= bo){ + dataMap.put("COMPANYNAME",bo.getString("COMPANYNAME")); + dataMap.put("CNAMEFONTSIZE",bo.getString("CNAMEFONTSIZE")); + dataMap.put("FILETITLE",bo.getString("FILETITLE")); + dataMap.put("FILETITLEFONTSIZE",bo.getString("FILETITLEFONTSIZE")); + dataMap.put("HEADERFONT",bo.getString("HEADERFONT")); + dataMap.put("HEADERFONTSIZE",bo.getString("HEADERFONTSIZE")); + dataMap.put("HEADERLOGO",bo.getString("HEADERLOGO")); + dataMap.put("FOOTERFONT",bo.getString("FOOTERFONT")); + dataMap.put("FOOTERFONTSIZE",bo.getString("FOOTERFONTSIZE")); + } + } } diff --git a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml index ebdd8257..cd3233fa 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml +++ b/com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册4.xml @@ -6690,6 +6690,7 @@ y7fdOgAAAABJRU5ErkJggk== + @@ -6737,6 +6738,45 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 活动序号 + + + @@ -6892,6 +6932,41 @@ y7fdOgAAAABJRU5ErkJggk== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${table4.activity_number} + + +