增加方案图、工程制度标准图

com.awspaas.user.apps.coe.pal.output.zd/manifest.xml

@@ -3,7 +3,7 @@
 <app xmlns="http://www.actionsoft.com.cn/app">  
   <name>制度手册</name>  
   <version>1.0</version>  
-  <buildNo>4</buildNo>  
+  <buildNo>23</buildNo>  
   <developer id="00000000000000000000000000000000" tablePrefix="EU" url="http://www.awspaas.com">AWSPaaS-EndUser</developer>  
   <categoryVisible>false</categoryVisible>  
   <description><![CDATA[将流程输入输出等关键要素和关联模型输出成易于阅读和打印的Word文档]]></description>  

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

@@ -36,7 +36,7 @@ public class Plugins implements PluginListener {
 		params1.put("targetMethodType", "");// 建模方法中的图元，为空表示只选择文件，不选择图元；为"-"表示所有类型图元
 		params1.put("relationMethodScope", "-");// 如果设置-，表示不需要用户选择关联范围，向导页被忽略*/
 		// 建模大类、建模方法，多个用逗号隔开，如果为空表示全部  org.normal
-		params1.put("targetMethodScope", "control.policy");
+		params1.put("targetMethodScope", "control.policy,process.scheme,engineering.standard");
 		// 建模方法中的图元，为空表示只选择文件，不选择图元；为"-"表示所有类型图元
 		params1.put("targetMethodType", "");
 		// 如果设置-，表示不需要用户选择关联范围，向导页被忽略

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

@@ -80,9 +80,12 @@ public class Report1Gener {
             String tempName;
             if(PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString()).getMethodId().equals("process.scheme")){
                 tempName = "方案-手册1.xml";
+            }else if(PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString()).getMethodId().equals("engineering.standard")){
+                tempName="工程企业标准模版-封面.xml";
             }else{
                 tempName="制度-手册5.xml";
             }
+            /*String tempName = "制度-手册5.xml";*/
             log.info("begin...");
             log.info("-------------------");
             // ----文件处理-----
@@ -137,8 +140,8 @@ public class Report1Gener {
                             String plver = "";
                             if (!"".equals(plvers)) {
                                 if (plvers.length() > 1) {
-                                    plver = plvers.substring(0, 1) + "."
+                                    //plver = plvers.substring(0, 1) + "." + plvers.substring(plvers.length() - 1, plvers.length());
-                                            + 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";
                                 }

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

@@ -44,7 +44,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 public class PrReportComment {
-	public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart";
+	public static String TARGET_METHOD_SCOPE = "process.bpmn2,process.epc,process.flowchart,engineering.standard";
 	public static String PROCESS_STEP = "userTask,serviceTask,manualTask,receiveTask,sendTask,scriptTask,businessRuleTask,callActivityCallingProcess,method,process,predefinedProcess,decision";
 
 	/**