From c216fdc4bf74aedcd6a0af5e37cb189da1e6a638 Mon Sep 17 00:00:00 2001 From: lihongyu <504404568@qq.com> Date: Mon, 31 Oct 2022 17:42:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=86=8C=E5=86=85=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=8F=96=E6=A8=A1=E5=9E=8B=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pal/output/pr/report1/Report1Gener.java | 33 +++++++++--- .../pal/output/pr/util/PrReportComment.java | 51 +++++++++++++++---- .../pal/output/bd/report1/Report1Gener.java | 30 +++++++++-- .../pal/output/bd/util/PrReportComment.java | 20 +++++++- .../pal/output/zd/report1/Report1Gener.java | 18 ++++++- .../pal/output/zd/util/PrReportComment.java | 19 ++++++- 6 files changed, 148 insertions(+), 23 deletions(-) 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 2d95ac07..794aed4b 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 @@ -139,11 +139,21 @@ public class Report1Gener { List repositoryPropertyList = PALRepositoryPropertyCache.getPropertyByPlId(model.getId()); if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) { for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) { - //if (repositoryPropertyModel.getPropertyValue().equals("")){ - //extendAttr.put(repositoryPropertyModel.getPropertyId(), "空"); - //}else { + if ("P_versions".equals(repositoryPropertyModel.getPropertyId())){ + String plvers = model.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + extendAttr.put(repositoryPropertyModel.getPropertyId(), "V"+plver); + }else { extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue()); - //} + } } } List reportNameLabels = OutputExcelUtil.string2label(reportName); @@ -586,8 +596,19 @@ public class Report1Gener { // 版本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); + String plvers = model.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + //val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING); + obj.put(attr, "V"+plver); + // 拟制/修订单位Issuing_department attr = "Issuing_department"; val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING); diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java index 6844be99..a8a96434 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java @@ -76,31 +76,48 @@ 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("表单数据内容获取=================="); + 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")); if (propertyObj.getString("key").equals("goal")) { if (propertyObj.getString("value").equals("")) { dataMap.put("pl_" + propertyObj.getString("key"), "无"); }else{ dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } - } - if(propertyObj.getString("key").equals("T_supplementary_articles")) { + }else if (propertyObj.getString("key").equals("T_supplementary_articles")) { if (propertyObj.getString("value").equals("")) { dataMap.put("pl_" + propertyObj.getString("key"), "无"); }else{ dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } - }else{ - dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); + }else if("P_versions".equals(propertyObj.getString("key"))) { + //版本取系统版本号 + String plvers = repositoryModel.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); + }else { + dataMap.put("pl_" + propertyObj.getString("key"), value); + } - } + 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 = ""; @@ -267,21 +284,35 @@ public class PrReportComment { JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); + String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value")); if (propertyObj.getString("key").equals("goal")) { if (propertyObj.getString("value").equals("")) { dataMap.put("pl_" + propertyObj.getString("key"), "无"); }else{ dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } - } - if(propertyObj.getString("key").equals("T_supplementary_articles")) { + }else if (propertyObj.getString("key").equals("T_supplementary_articles")) { if (propertyObj.getString("value").equals("")) { dataMap.put("pl_" + propertyObj.getString("key"), "无"); }else{ dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } - }else{ - dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); + }else if("P_versions".equals(propertyObj.getString("key"))) { + //版本取系统版本号 + String plvers = repositoryModel.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); + }else { + dataMap.put("pl_" + propertyObj.getString("key"), value); + } } diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index 0179055d..100123b0 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -134,7 +134,21 @@ public class Report1Gener { List repositoryPropertyList = PALRepositoryPropertyCache.getPropertyByPlId(model.getId()); if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) { for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) { - extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue()); + if ("P_versions".equals(repositoryPropertyModel.getPropertyId())){ + String plvers = model.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + extendAttr.put(repositoryPropertyModel.getPropertyId(), "V"+plver); + }else { + extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue()); + } } } List reportNameLabels = OutputExcelUtil.string2label(reportName); @@ -531,8 +545,18 @@ public class Report1Gener { // 版本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); + String plvers = model.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + //val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING); + obj.put(attr, "V"+plver); // 拟制/修订单位Issuing_department attr = "Issuing_department"; val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java index 1686b959..9a968b69 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java @@ -80,7 +80,25 @@ public class PrReportComment { JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); - dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); + String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value")); + //版本取系统版本号 + if("P_versions".equals(propertyObj.getString("key"))) { + String plvers = repositoryModel.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); + }else { + dataMap.put("pl_" + propertyObj.getString("key"), value); + + } + //dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } // 责任人、责任部门单独处理，兼容流程手册中直接使用pl_key进行定义 boolean dutyRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.awspaas.user.apps.coe.pal.output.bd", "DUTY_DEPARTMENT_PERSON_RELATION_TYPE", false); diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 37e88409..a5ed971e 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -142,7 +142,21 @@ public class Report1Gener { List repositoryPropertyList = PALRepositoryPropertyCache.getPropertyByPlId(model.getId()); if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) { for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) { - extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue()); + if ("P_versions".equals(repositoryPropertyModel.getPropertyId())){ + String plvers = model.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + extendAttr.put(repositoryPropertyModel.getPropertyId(), "V"+plver); + }else { + extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue()); + } } } List reportNameLabels = OutputExcelUtil.string2label(reportName); @@ -700,7 +714,7 @@ public class Report1Gener { int count = 0; for (DesignerShapeRelationModel relation : relationList2) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID - System.err.println("生成手册时相关文件id=======>"+relationFileId); + //System.err.println("生成手册时相关文件id=======>"+relationFileId); PALRepositoryModel model = PALRepositoryCache.getCache().get(relationFileId); if (model != null) { count++; diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java index cf08ce37..c305a47b 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java @@ -99,7 +99,24 @@ public class PrReportComment { JSONArray propertyArr = CoeProcessLevelUtil.getProcessLevelPropertyArr(repositoryModel.getId()); for (int i = 0; i < propertyArr.size(); i++) { JSONObject propertyObj = propertyArr.getJSONObject(i); - dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); + String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value")); + //版本取系统版本号 + if("versions".equals(propertyObj.getString("key"))) { + String plvers = repositoryModel.getVersion()+""; + String plver = ""; + if (!"".equals(plvers)) { + if (plvers.length() > 1) { + plver = plvers.substring(0, 1) + "." + + plvers.substring(plvers.length() - 1, plvers.length()); + } else { + plver = plvers.substring(0, 1) + ".0"; + } + } + dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver); + }else { + dataMap.put("pl_" + propertyObj.getString("key"), value); + } + //dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value"))); } // 责任人、责任部门单独处理，兼容流程手册中直接使用pl_key进行定义 boolean dutyRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.awspaas.user.apps.coe.pal.output.zd", "DUTY_DEPARTMENT_PERSON_RELATION_TYPE", false);