提交

metadata/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum.enum

@@ -164,6 +164,18 @@
             <userDefined>true</userDefined>
             <value>sign_flow_list</value>
         </enumValue>
+        <enumValue>
+            <name>createBySignTemplate</name>
+            <alias>bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[createBySignTemplate].alias</alias>
+            <userDefined>true</userDefined>
+            <value>createBySignTemplate</value>
+        </enumValue>
+        <enumValue>
+            <name>sign_templates_detail</name>
+            <alias>bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[sign_templates_detail].alias</alias>
+            <userDefined>true</userDefined>
+            <value>sign_templates_detail</value>
+        </enumValue>
     </enumValues>
     <resource>
         <rs key="bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].alias">
@@ -214,6 +226,12 @@
             <lang locale="zh_HK" value="填寫範本生成文件" />
             <lang locale="zh_TW" value="填寫範本生成文件" />
         </rs>
+        <rs key="bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[createBySignTemplate].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="通过流程模板创建合同拟定和签署流程" />
+            <lang locale="zh_HK" value="通過流程範本創建合同擬定和簽署流程" />
+            <lang locale="zh_TW" value="通過流程範本創建合同擬定和簽署流程" />
+        </rs>
         <rs key="bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[create_by_file].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="基于文件发起签署" />
@@ -322,6 +340,12 @@
             <lang locale="zh_HK" value="查詢簽署流程列表" />
             <lang locale="zh_TW" value="查詢簽署流程列表" />
         </rs>
+        <rs key="bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[sign_templates_detail].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="查询流程模板详情" />
+            <lang locale="zh_HK" value="查詢流程範本詳情" />
+            <lang locale="zh_TW" value="查詢流程範本詳情" />
+        </rs>
         <rs key="bizEnum[com.kingdee.eas.custom.esign.bizEnum.EsignConfigEnum].enumValues.enumValue[start_by_file].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="开启签署流程" />
@@ -341,3 +365,4 @@
         </rs>
     </resource>
 </bizEnum>
+

src/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum.java

@@ -39,6 +39,8 @@ public class EsignConfigEnum extends StringEnum
     public static final String KEYWORD_POSITIONS_VALUE = "keyword_positions";//alias=检索文件关键字坐标
     public static final String GET_SEAL_POSITION_URL_VALUE = "get_seal_position_url";//alias=获取拖章定位页面
     public static final String SIGN_FLOW_LIST_VALUE = "sign_flow_list";//alias=查询签署流程列表
+    public static final String CREATEBYSIGNTEMPLATE_VALUE = "createBySignTemplate";//alias=通过流程模板创建合同拟定和签署流程
+    public static final String SIGN_TEMPLATES_DETAIL_VALUE = "sign_templates_detail";//alias=查询流程模板详情
 
     public static final EsignConfigEnum EsignAppId = new EsignConfigEnum("EsignAppId", ESIGNAPPID_VALUE);
     public static final EsignConfigEnum EsignAppSecret = new EsignConfigEnum("EsignAppSecret", ESIGNAPPSECRET_VALUE);
@@ -66,6 +68,8 @@ public class EsignConfigEnum extends StringEnum
     public static final EsignConfigEnum keyword_positions = new EsignConfigEnum("keyword_positions", KEYWORD_POSITIONS_VALUE);
     public static final EsignConfigEnum get_seal_position_url = new EsignConfigEnum("get_seal_position_url", GET_SEAL_POSITION_URL_VALUE);
     public static final EsignConfigEnum sign_flow_list = new EsignConfigEnum("sign_flow_list", SIGN_FLOW_LIST_VALUE);
+    public static final EsignConfigEnum createBySignTemplate = new EsignConfigEnum("createBySignTemplate", CREATEBYSIGNTEMPLATE_VALUE);
+    public static final EsignConfigEnum sign_templates_detail = new EsignConfigEnum("sign_templates_detail", SIGN_TEMPLATES_DETAIL_VALUE);
 
     /**
      * construct function

src/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum.properties

@@ -24,3 +24,5 @@ org_authorized_seal_list=\u67E5\u8BE2\u88AB\u5916\u90E8\u4F01\u4E1A\u6388\u6743\
 keyword_positions=\u68C0\u7D22\u6587\u4EF6\u5173\u952E\u5B57\u5750\u6807
 get_seal_position_url=\u83B7\u53D6\u62D6\u7AE0\u5B9A\u4F4D\u9875\u9762
 sign_flow_list=\u67E5\u8BE2\u7B7E\u7F72\u6D41\u7A0B\u5217\u8868
+createBySignTemplate=\u901A\u8FC7\u6D41\u7A0B\u6A21\u677F\u521B\u5EFA\u5408\u540C\u62DF\u5B9A\u548C\u7B7E\u7F72\u6D41\u7A0B
+sign_templates_detail=\u67E5\u8BE2\u6D41\u7A0B\u6A21\u677F\u8BE6\u60C5

src/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum_l1.properties

@@ -24,3 +24,5 @@ org_authorized_seal_list=
 keyword_positions=
 get_seal_position_url=
 sign_flow_list=
+createBySignTemplate=
+sign_templates_detail=

src/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum_l2.properties

@@ -24,3 +24,5 @@ org_authorized_seal_list=\u67E5\u8BE2\u88AB\u5916\u90E8\u4F01\u4E1A\u6388\u6743\
 keyword_positions=\u68C0\u7D22\u6587\u4EF6\u5173\u952E\u5B57\u5750\u6807
 get_seal_position_url=\u83B7\u53D6\u62D6\u7AE0\u5B9A\u4F4D\u9875\u9762
 sign_flow_list=\u67E5\u8BE2\u7B7E\u7F72\u6D41\u7A0B\u5217\u8868
+createBySignTemplate=\u901A\u8FC7\u6D41\u7A0B\u6A21\u677F\u521B\u5EFA\u5408\u540C\u62DF\u5B9A\u548C\u7B7E\u7F72\u6D41\u7A0B
+sign_templates_detail=\u67E5\u8BE2\u6D41\u7A0B\u6A21\u677F\u8BE6\u60C5

src/com/kingdee/eas/custom/esign/bizEnum/EsignConfigEnum_l3.properties

@@ -24,3 +24,5 @@ org_authorized_seal_list=\u67E5\u8A62\u88AB\u5916\u90E8\u4F01\u696D\u6388\u6B0A\
 keyword_positions=\u6AA2\u7D22\u6587\u4EF6\u95DC\u9375\u5B57\u5EA7\u6A19
 get_seal_position_url=\u7372\u53D6\u62D6\u7AE0\u5B9A\u4F4D\u9801\u9762
 sign_flow_list=\u67E5\u8A62\u7C3D\u7F72\u6D41\u7A0B\u5217\u8868
+createBySignTemplate=\u901A\u904E\u6D41\u7A0B\u7BC4\u672C\u5275\u5EFA\u5408\u540C\u64EC\u5B9A\u548C\u7C3D\u7F72\u6D41\u7A0B
+sign_templates_detail=\u67E5\u8A62\u6D41\u7A0B\u7BC4\u672C\u8A73\u60C5

src/com/kingdee/eas/custom/esign/util/SyncSignedFilesUtil.java

@@ -21,7 +21,6 @@ import com.kingdee.eas.custom.esign.tsign.hz.comm.EsignHttpResponse;
 import com.kingdee.shr.attachment.*;
 import com.kingdee.shr.attachment.AttachmentTypeEnum;
 import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
-import com.kingdee.shr.base.syssetting.ml.SHRWebResource;
 import com.kingdee.shr.ml.util.MutilanUtils;
 import com.kingdee.util.LocaleUtils;
 import com.kingdee.util.STConverter;
@@ -188,6 +187,9 @@ public class SyncSignedFilesUtil {
                     mainname = fileName.substring(0, index);
                     extname = fileName.substring(index + 1, fileName.length()).toLowerCase();
                 }
+                if ("html".equals(extname)){
+                    extname="pdf";
+                }
                 //附件对象
                 AttachmentInfo ai = new AttachmentInfo();
                 setAttMulNameAndDesc(ctx, ai, mainname, null);
@@ -195,21 +197,21 @@ public class SyncSignedFilesUtil {
                 ai.setFile(content);
                 ai.setIsShared(false);
                 //ai.setNumber();
-                ai.setSharedDesc(SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "false"));
+                ai.setSharedDesc("否");
                 int size = content.length;
                 if (size < 1024) {
-                    ai.setSize(size + SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "byte"));
+                    ai.setSize(size + "KB");
                 } else {
                     ai.setSize(size / 1024 + "KB");
                 }
                 ai.setSizeInByte(size);
                 ai.setAttachID(fileId);//附件id
-                ai.setType(getFileType(fileName));
+                ai.setType(getFileType(mainname+"."+extname));
                 ai.setBeizhu(EMPPAGEUIPK);//uipk
                 //附件扩展
                 SHRAttachmentExtInfo attchExt = new SHRAttachmentExtInfo();
                 attchExt.setAttachment(ai);
-                setAttExtMulNameAndDesc(ctx, attchExt, fileName, "");
+                setAttExtMulNameAndDesc(ctx, attchExt, mainname+"."+extname, "");
                 attchExt.setPropertyName(componentId);
                 attchExt.setType(AttachmentTypeEnum.FORM);
                 attchExt.setState(AttachmentState.SAVE);
@@ -342,15 +344,15 @@ public class SyncSignedFilesUtil {
                 // 判断是否为PowerPoint文档类型
                 if (!"ppt".equalsIgnoreCase(extname) && !"pptx".equalsIgnoreCase(extname) && !"pptm".equalsIgnoreCase(extname)) {
                     // 判断是否为文本文件或其他未知类型
-                    return "txt".equalsIgnoreCase(extname) ? SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "text") : MessageFormat.format(SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "unknow_type"), extname);
+                    return "txt".equalsIgnoreCase(extname) ? "TEXT 文本文件" : MessageFormat.format("未知文件类型(.{0})", extname);
                 } else {
-                    return SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "microsoft_ppt");
+                    return "Microsoft PowerPoint 幻灯片";
                 }
             } else {
-                return SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "microsoft_excel");
+                return "Microsoft Excel 表格";
             }
         } else {
-            return SHRWebResource.getString("com.kingdee.shr.base.syssetting.SHRSyssettingResource", "microsoft_word");
+            return "Microsoft Word 文档";
         }
     }
 

websrc/com/kingdee/eas/custom/esign/handler/ESignGlobalStatusOverviewListHandler.java

@@ -594,6 +594,9 @@ public class ESignGlobalStatusOverviewListHandler extends ListHandler {
         String mainname = fileName.substring(0, fileName.lastIndexOf(46));
         String extname = fileName.substring(fileName.lastIndexOf(46) + 1, fileName.length());
         extname = extname.toLowerCase();
+        if ("html".equals(extname)){
+            extname="pdf";
+        }
         SHRAttachmentExtInfo attchExt = new SHRAttachmentExtInfo();
         AttachmentInfo ai = new AttachmentInfo();
         this.setAttMulNameAndDesc(ctx, ai, mainname, fileId);
@@ -610,10 +613,10 @@ public class ESignGlobalStatusOverviewListHandler extends ListHandler {
         }
         ai.setSizeInByte(size);
         ai.setAttachID("" + System.currentTimeMillis());
-        ai.setType(this.getFileType(fileName));
+        ai.setType(this.getFileType(mainname+"."+extname));
         ai.setBeizhu(uipk);
         attchExt.setAttachment(ai);
-        this.setAttExtMulNameAndDesc(ctx, attchExt, fileName, fileId);
+        this.setAttExtMulNameAndDesc(ctx, attchExt, mainname+"."+extname, fileId);
         attchExt.setPropertyName(propertyName);
         attchExt.setType(AttachmentTypeEnum.PROPERTY);
         attchExt.setState(AttachmentState.UNSAVE);

websrc/com/kingdee/eas/custom/esign/osf/Create_by_fileOSFService.java

@@ -600,6 +600,12 @@ public class Create_by_fileOSFService implements IHRMsfService {
                                         signFieldPosition.put("positionPage", fieldMap.get("positionPage"));
                                         signFieldPosition.put("positionX", fieldMap.get("positionX"));
                                         signFieldPosition.put("positionY", fieldMap.get("positionY"));
+                                        Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
+                                        if(null==signDateConfig) {
+                                            signDateConfig = Maps.newHashMap();
+                                            //signDateConfig.put("showSignDate", 1);
+                                        }
+                                        field.put("signDateConfig", signDateConfig);
                                     } else {
                                         Map<String, Object> res = Maps.newHashMap();
                                         //失败
@@ -611,12 +617,7 @@ public class Create_by_fileOSFService implements IHRMsfService {
                                     signFieldPosition.put("positionY", fieldMap.get("positionY"));
                                 }
                                 normalSignFieldConfig.put("signFieldPosition", signFieldPosition);
-                                Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
-                                if(null==signDateConfig) {
-                                    signDateConfig = Maps.newHashMap();
-                                    //signDateConfig.put("showSignDate", 1);
-                                }
-                                field.put("signDateConfig", signDateConfig);
+
                             } else {
                                 //手动签章
                                 normalSignFieldConfig.put("freeMode", false);
@@ -632,6 +633,12 @@ public class Create_by_fileOSFService implements IHRMsfService {
                                         signFieldPosition.put("positionPage", fieldMap.get("positionPage"));
                                         signFieldPosition.put("positionX", fieldMap.get("positionX"));
                                         signFieldPosition.put("positionY", fieldMap.get("positionY"));
+                                        Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
+                                        if(null==signDateConfig) {
+                                            signDateConfig = Maps.newHashMap();
+                                            //signDateConfig.put("showSignDate", 1);
+                                        }
+                                        field.put("signDateConfig", signDateConfig);
                                     } else {
                                         Map<String, Object> res = Maps.newHashMap();
                                         //失败
@@ -643,12 +650,7 @@ public class Create_by_fileOSFService implements IHRMsfService {
                                     signFieldPosition.put("positionY", fieldMap.get("positionY"));
                                 }
                                 normalSignFieldConfig.put("signFieldPosition", signFieldPosition);
-                                Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
-                                if(null==signDateConfig) {
-                                    signDateConfig = Maps.newHashMap();
-                                    //signDateConfig.put("showSignDate", 1);
-                                }
-                                field.put("signDateConfig", signDateConfig);
+
                             }
                             field.put("normalSignFieldConfig", normalSignFieldConfig);
                         } else {
@@ -769,18 +771,18 @@ public class Create_by_fileOSFService implements IHRMsfService {
                                 signFieldPosition.put("positionPage", fieldMap.get("positionPage"));
                                 signFieldPosition.put("positionX", fieldMap.get("positionX"));
                                 signFieldPosition.put("positionY", fieldMap.get("positionY"));
+                                Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
+                                if(null==signDateConfig) {
+                                    signDateConfig = Maps.newHashMap();
+                                }
+                                field.put("signDateConfig", signDateConfig);
                             }
                         } else {
                             //骑缝章
                             signFieldPosition.put("positionY", fieldMap.get("positionY"));
                         }
                         normalSignFieldConfig.put("signFieldPosition", signFieldPosition);
-                        Map<String, Object> signDateConfig = (Map<String, Object>) fieldMap.get("signDateConfig");
-                        if(null==signDateConfig) {
-                            signDateConfig = Maps.newHashMap();
-                            signDateConfig.put("showSignDate", 1);
-                        }
-                        field.put("signDateConfig", signDateConfig);
+
                         field.put("normalSignFieldConfig", normalSignFieldConfig);
                     } else {
                         field.put("signFieldType", fieldMap.get("signFieldType"));