版本号代码，统一调用PAL中versionUtil方法

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

@@ -33,6 +33,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelI
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 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;
@@ -160,18 +161,8 @@ public class Report1Gener {
 				if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
 					for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) {
 						if ("P_versions".equals(repositoryPropertyModel.getPropertyId())){
-							String plvers = model.getVersion()+"";
+							//yujh 修改，统一使用版本工具类获取版本号
-							String plver = "";
+							extendAttr.put(repositoryPropertyModel.getPropertyId(), VersionUtil.getVersionStrV(model.getVersion()));
-							if (!"".equals(plvers)) {
-								if (plvers.length() > 1) {
-									//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";
-								}
-							}
-							extendAttr.put(repositoryPropertyModel.getPropertyId(), "V"+plver);
 						}else {
 							extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue());
 						}
@@ -993,18 +984,8 @@ public class Report1Gener {
 			// 版本P_versions
 			String attr = "P_versions";
 			String val = "";
-			String plvers = model.getVersion()+"";
+			//yujh 修改，统一使用版本工具类获取版本号
-			String plver = "";
+			obj.put(attr, VersionUtil.getVersionStrV(model.getVersion()));
-			if (!"".equals(plvers)) {
-				if (plvers.length() > 1) {
-					//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";
-				}
-			}
-			//val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
-			obj.put(attr, "V"+plver);
 			
 			// 拟制/修订单位Issuing_department
 			attr = "Issuing_department";

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

@@ -17,6 +17,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.org.cache.UserCache;
 import com.actionsoft.bpms.server.DispatcherRequest;
@@ -102,18 +103,8 @@ public class PrReportComment {
 					dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
 				}
 			}else if("P_versions".equals(propertyObj.getString("key"))) {
-				//版本取系统版本号
+				//yujh 修改，统一使用版本工具类获取版本号
-				String plvers = repositoryModel.getVersion()+"";
+				dataMap.put("pl_" + propertyObj.getString("key"), VersionUtil.getVersionStrV(repositoryModel.getVersion()));
-				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,plvers.indexOf(".")) + "." + 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);
 				
@@ -299,18 +290,8 @@ public class PrReportComment {
 					dataMap.put("pl_" + propertyObj.getString("key"), OutputWordUtil.specialCharTransfer(propertyObj.getString("value")));
 				}
 			}else if("P_versions".equals(propertyObj.getString("key"))) {
-				//版本取系统版本号
+				//yujh 修改，统一使用版本工具类获取版本号
-				String plvers = repositoryModel.getVersion()+"";
+				dataMap.put("pl_" + propertyObj.getString("key"), VersionUtil.getVersionStrV(repositoryModel.getVersion()));
-				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,plvers.indexOf(".")) + "." + plvers.substring(plvers.length() - 1, plvers.length());
-					} else {
-						plver = plvers.substring(0, 1) + ".0";
-					}
-				}
-				dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver);
 			}else if("application".equals(propertyObj.getString("key"))){
 				dataMap.put("pl_" + propertyObj.getString("key"), value.replace("\n", WRAPSTRING));
 			}else{

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java

@@ -18,6 +18,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import com.actionsoft.apps.coe.pal.util.HttpPostUtil;
 import com.actionsoft.apps.coe.pal.util.WPS4Util;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
@@ -2639,17 +2640,8 @@ public class OutputWordUtil {
             // 版本P_versions，制度用的是versions
             //String attr = "versions";
             String val = "";
-            String plvers = model.getVersion() + "";
+            //yujh 修改，统一使用版本工具类获取版本号
-            String plver = "";
+            obj.put(attr, VersionUtil.getVersionStrV(model.getVersion()));
-            if (!"".equals(plvers)) {
-                if (plvers.length() > 1) {
-                    plver = plvers.substring(0,plvers.indexOf(".")) + "." + 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);

com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java

@@ -22,6 +22,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 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;
@@ -147,17 +148,8 @@ public class Report1Gener {
 				if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
 					for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) {
 						if ("P_versions".equals(repositoryPropertyModel.getPropertyId())){
-							String plvers = model.getVersion()+"";
+							//yujh 修改，统一使用版本工具类获取版本号
-							String plver = "";
+							extendAttr.put(repositoryPropertyModel.getPropertyId(), VersionUtil.getVersionStrV(model.getVersion()));
-							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());
 						}
@@ -634,18 +626,8 @@ public class Report1Gener {
 			// 版本P_versions
 			String attr = "P_versions";
 			String val = "";
-			String plvers = model.getVersion()+"";
+			//yujh 修改，统一使用版本工具类获取版本号
-			String plver = "";
+			obj.put(attr, VersionUtil.getVersionStrV(model.getVersion()));
-			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);

com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java

@@ -14,6 +14,7 @@ import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import com.actionsoft.bpms.org.cache.UserCache;
 import com.actionsoft.bpms.util.Base64;
 import com.actionsoft.bpms.util.UtilDate;
@@ -87,17 +88,8 @@ public class PrReportComment {
 			String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value"));
 			//版本取系统版本号
 			if("P_versions".equals(propertyObj.getString("key"))) {
-				String plvers = repositoryModel.getVersion()+"";
+				//yujh 修改，统一使用版本工具类获取版本号
-				String plver = "";
+				dataMap.put("pl_" + propertyObj.getString("key"), VersionUtil.getVersionStrV(repositoryModel.getVersion()));
-				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 if("form_Scope_application".equals(propertyObj.getString("key"))){
 				dataMap.put("pl_" + propertyObj.getString("key"), value.replace("\n", WRAPSTRING));
 			}else{

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/InstitutionalTextWeb.java

@@ -13,6 +13,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.bo.engine.BO;
@@ -236,17 +237,8 @@ public class InstitutionalTextWeb extends ActionWeb {
                 if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
                     for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) {
                         if ("P_versions".equals(repositoryPropertyModel.getPropertyId())) {
-                            String plvers = model.getVersion() + "";
+                            //yujh 修改，统一使用版本工具类获取版本号
-                            String plver = "";
+                            extendAttr.put(repositoryPropertyModel.getPropertyId(), VersionUtil.getVersionStrV(model.getVersion()));
-                            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());
                         }
@@ -401,17 +393,8 @@ public class InstitutionalTextWeb extends ActionWeb {
                 if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
                     for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) {
                         if ("P_versions".equals(repositoryPropertyModel.getPropertyId())) {
-                            String plvers = model.getVersion() + "";
+                            //yujh 修改，统一使用版本工具类获取版本号
-                            String plver = "";
+                            extendAttr.put(repositoryPropertyModel.getPropertyId(), VersionUtil.getVersionStrV(model.getVersion()));
-                            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());
                         }

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/UpFileExcelAndPptController.java

@@ -14,6 +14,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import org.apache.poi.hslf.usermodel.HSLFPictureData;
 import org.apache.poi.hslf.usermodel.HSLFPictureShape;
 import org.apache.poi.hslf.usermodel.HSLFShape;
@@ -866,17 +867,8 @@ public class UpFileExcelAndPptController {
 			// 版本P_versions
 			String attr = "P_versions";
 			String val = "";
-			String plvers = String.valueOf(model.getVersion());
+			//yujh 修改，统一使用版本工具类获取版本号
-			String plver = "";
+			obj.put(attr, VersionUtil.getVersionStrV(model.getVersion()));
-			if (!"".equals(plvers)) {
-				if (plvers.length() > 1) {
-					plver = plvers.charAt(0) + "." + plvers.substring(plvers.length() - 1);
-				} else {
-					plver = plvers.charAt(0) + ".0";
-				}
-			}
-			//val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", "");
-			obj.put(attr, "V" + plver);
 
 			// 拟制/修订单位Issuing_department
 			attr = "Issuing_department";

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java

@@ -15,6 +15,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 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;
@@ -164,17 +165,8 @@ public class Report1Gener {
                 if (repositoryPropertyList != null && repositoryPropertyList.size() > 0) {
                     for (PALRepositoryPropertyModel repositoryPropertyModel : repositoryPropertyList) {
                         if ("P_versions".equals(repositoryPropertyModel.getPropertyId())) {
-                            String plvers = model.getVersion() + "";
+                            //yujh 修改，统一使用版本工具类获取版本号
-                            String plver = "";
+                            extendAttr.put(repositoryPropertyModel.getPropertyId(), VersionUtil.getVersionStrV(model.getVersion()));
-                            if (!"".equals(plvers)) {
-                                if (plvers.length() > 1) {
-                                    //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";
-                                }
-                            }
-                            extendAttr.put(repositoryPropertyModel.getPropertyId(), "V" + plver);
                         } else {
                             extendAttr.put(repositoryPropertyModel.getPropertyId(), repositoryPropertyModel.getPropertyValue());
                         }
@@ -373,18 +365,8 @@ public class Report1Gener {
             // 版本P_versions，制度用的是versions
             String attr = "versions";
             String val = "";
-            String plvers = model.getVersion() + "";
+            //yujh 修改，统一使用版本工具类获取版本号
-            String plver = "";
+            obj.put(attr,VersionUtil.getVersionStrV(model.getVersion()));
-            if (!"".equals(plvers)) {
-                if (plvers.length() > 1) {
-                    //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";
-                }
-            }
-            //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);

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java

@@ -30,6 +30,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryAttributeMo
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
+import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
 import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil;
 import org.apache.commons.lang.StringUtils;
 
@@ -106,17 +107,8 @@ public class PrReportComment {
 			String value = OutputWordUtil.specialCharTransfer(propertyObj.getString("value"));
 			//版本取系统版本号
 			if("versions".equals(propertyObj.getString("key"))) {
-				String plvers = repositoryModel.getVersion()+"";
+				//yujh 修改，统一使用版本工具类获取版本号
-				String plver = "";
+				dataMap.put("pl_" + propertyObj.getString("key"), VersionUtil.getVersionStrV(repositoryModel.getVersion()));
-				if (!"".equals(plvers)) {
-					if (plvers.length() > 1) {
-						//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";
-					}
-				}
-				dataMap.put("pl_" + propertyObj.getString("key"), "V"+plver);
 			}else if("application".equals(propertyObj.getString("key"))) {
 				dataMap.put("pl_application", value.replace("\n", WRAPSTRING));
 			}else {

com.awspaas.user.bpa/src/com/awspaas/user/bpa/aslp/UpdatePptxAndExcelAslp.java

@@ -849,18 +849,8 @@ public class UpdatePptxAndExcelAslp implements ASLP {
             // 版本P_versions
             String attr = "P_versions";
             String val = "";
-            String plvers = model.getVersion()+"";
+            //yujh 修改，统一使用版本工具类获取版本号
-            String plver = "";
+            obj.put(attr, VersionUtil.getVersionStrV(model.getVersion()));
-            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", "");
-            obj.put(attr, "V"+plver);
 
             // 拟制/修订单位Issuing_department
             attr = "Issuing_department";