zqy před 3 týdny
rodič
revize
b38d9ac44a

+ 108 - 63
GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/CommonCertificationBillListEx.js

@@ -93,54 +93,67 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
         var isSign = rowData.isSign; // 是否已签署
         var signNo = rowData.signNO;
         var billId = rowData.id;
-        if("2" == drawUpMode && signNo != null && signNo != undefined && signNo != '' && "1" == isSign){//已签署
-            var _time1 = 0;
-            var showMsg = "";
-            var intervalID = setInterval(function() {
-                _time1++;
-                shr.callService({
-                    serviceName : 'electronicLaborRefreshLocalService',
-                    param : {
-                        contractNo : signNo,
-                        billId : billId,
-                        isDefault : "1"
-                    },
-                    async : false,
-                    success : function(response) {
-                        if(response&&response.code == 0){
-                            var pdfurl = '';
-                            pdfurl = response.data[0].sealInfo.previewOfPcUrl;
+        if("1" == isSign){//已签署
+            var newDate = new Date();
+            var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
+            var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
+            var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
+            var nowTime = hourStr+minuteStr+secondStr;
+            var contractNo = rowData.number;
+            shr.block.show();
+            shr.callService({
+                serviceName : 'empCreateCertificationService',
+                param : {
+                    billId : billId,
+                    posNum : nowTime
+                },
+                async : false,
+                success : function(response) {
+                    console.log('createCertificationService success');
+                    var _time3 = 0;
+                    var showMsg = "";
+                    var intervalID = setInterval(function() {
+                        _time3++;
+                        shr.callService({
+                            serviceName : 'empPreViewECertificationV2Service',
+                            param : {
+                                contractNo : contractNo+"-"+nowTime,
+                                billId : billId,
+                                isDefault : "1"
+                            },
+                            async : false,
+                            success : function(response) {
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+                                    var pdfurl = _self.assemblePreViewUrl(returnUrl);
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
+                                } else {
+                                    showMsg = response.msg;
+                                }
+                            },
+                            error: function(xhr,data){
 
-                            var downloadUrl = response.data[0].sealInfo.downloadUrl;
-                            _self.convertPdfToWord(pdfurl,downloadUrl,"已盖章");
+                            }
+                        });
+                        if (_time3 > 10){
                             shr.block.hide();
-                            // shr.openNew(pdfurl);
-                            clearInterval(intervalID);
-                        } else {
-                            if (msg != "") {
-                                showMsg = msg;
-                                return;
-                            } else {
-                                showMsg = jsBizMultLan.ssc_otherElectronicContractPreSignEdit_27063837_i18n_1;
-                                return;
+                            if (showMsg == "") {
+                                showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
                             }
+                            shr.showError({
+                                message: showMsg
+                            });
+                            clearInterval(intervalID);
                         }
-                    },
-                    error: function(xhr,data){
-
-                    }
-                });
-                if (_time1 > 10){
-                    clearInterval(intervalID);
-                    if (!showMsg || showMsg == "") {
-                        showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
-                    }
-                    shr.block.hide();
+                    }, 500);
+                },
+                error: function(xhr,data){
                     shr.showError({
-                        message: showMsg
+                        message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
                     });
+                    return;
                 }
-            }, 500);
+            });
             return;
         }else{
             var newDate = new Date();
@@ -151,7 +164,7 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
             var contractNo = rowData.number;
             shr.block.show();
             shr.callService({
-                serviceName : 'oldEmpCreateCertificationService',
+                serviceName : 'empCreateCertificationService',
                 param : {
                     billId : billId,
                     posNum : nowTime
@@ -164,7 +177,7 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
                     var intervalID = setInterval(function() {
                         _time3++;
                         shr.callService({
-                            serviceName : 'electronicLaborRefreshLocalService',
+                            serviceName : 'empPreViewECertificationV2Service',
                             param : {
                                 contractNo : contractNo+"-"+nowTime,
                                 billId : billId,
@@ -172,14 +185,14 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
                             },
                             async : false,
                             success : function(response) {
-                                if(response&&response.code == 0&&response.data[0]){
-                                    var pdfurl = '';
-                                    pdfurl = response.data[0].nosealInfo.previewOfPcUrl;
-                                    var downloadUrl = response.data[0].nosealInfo.downloadUrl;
-                                    _self.convertPdfToWord(pdfurl,downloadUrl,"未盖章");
-                                    shr.block.hide();
-                                    // shr.openNew(pdfurl);
-                                    clearInterval(intervalID);
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+
+                                    //shr.openNew(pdfurl);
+
+                                    // pdfurl = "https://gtiit.kdeascloud.com"+pdfurl;
+                                    //var downloadUrl = response.data[0].nosealInfo.downloadUrl;
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
                                 } else {
                                     showMsg = response.msg;
                                 }
@@ -188,8 +201,7 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
 
                             }
                         });
-                        if (_time3 > 10){
-                            shr.customer.gtiit.CommonCertificationBillListEx.superClass.previewPrintAction.call(_self);
+                        if (_time3 > 20){
                             shr.block.hide();
                             if (showMsg == "") {
                                 showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
@@ -210,11 +222,10 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
             });
         }
     },
-    convertPdfToWord: function(previewOfPcUrl, downloadUrl, isSign){
+    convertPdfToWord: function(contractNo, attachId, isSign,intervalID){
         var _self = this;
-        previewOfPcUrl = decodeURIComponent(previewOfPcUrl);
-        const contractNo = _self.getContractParamsFromURL(previewOfPcUrl);
-        downloadUrl = encodeURIComponent(downloadUrl);
+
+        //ownloadUrl = encodeURIComponent(downloadUrl);
         const date = new Date();
         const year = date.getFullYear();
         const month = (date.getMonth() + 1).toString().padStart(2, "0");
@@ -222,12 +233,46 @@ shr.defineClass("shr.empcertification.CommonCertificationBillListEx", shr.empcer
         var currentDate = year+month+day;
         var fileName = contractNo + isSign + "-" + currentDate + ".docx";
 
-        var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
-        var downloadLink = document.createElement('a');
-        downloadLink.href = urlinner;
-        document.body.appendChild(downloadLink);
-        downloadLink.click();
-        document.body.removeChild(downloadLink);
+        //var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
+        //var downloadLink = document.createElement('a');
+        //downloadLink.href = urlinner;
+        //document.body.appendChild(downloadLink);
+        //downloadLink.click();
+        //document.body.removeChild(downloadLink);
+        shr.callHandler({
+            handler: "com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx",
+            action: "convertPdfToWord",
+            param: {
+                attachId: attachId,
+                fileName:fileName
+            },
+            type: "POST",
+            async:false,
+            success: function (res) {
+                if (res != null&&res.code=="ok") {
+                    var pdfurl = _self.assembleDownloadUrl(attachId);
+                    shr.openNew(pdfurl);
+                    shr.block.hide();
+                    clearInterval(intervalID);
+                }
+            }
+        });
+    },
+    assembleDownloadUrl:function(attachmentId, params) {
+        var _self = this;
+        var param = $.extend({
+            method: 'download',
+            id: attachmentId,
+            permItemId: shr.getCurrentPagePermItemId(),
+            billId:shr.getUrlRequestParam('billId'),
+            uipk:shr.getUrlRequestParam('uipk'),
+            assigmentId:shr.getAssignmentId(),
+            ProcInstId:shr.getProcInstId(),
+            msgId:shr.getMsgId(),
+            shruicode:shr.getShruicode()
+        }, params);
+        var url = shr.getContextPath() + '/attachmentUpload.do?' + $.param(param);
+        return url;
     },
     getContractParamsFromURL: function(url){
         // 定义正则表达式

+ 174 - 129
GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/HRCertificationBillListEx.js

@@ -38,7 +38,7 @@ shr.defineClass("shr.customer.gtiit.HRCertificationBillListEx", shr.empCertifica
             shr.customer.gtiit.HRCertificationBillListEx.superClass.previewPrintAction.call(_self);
         }else {
             _self.previewPrintActionV2();
-        }
+		}
     },
     previewPrintActionV2 : function () {
         var _self = this;
@@ -95,142 +95,187 @@ shr.defineClass("shr.customer.gtiit.HRCertificationBillListEx", shr.empCertifica
         var isSign = rowData.isSign; // 是否已签署
         var signNo = rowData.signNO;
         var billId = rowData.id;
-        if("2" == drawUpMode && signNo != null && signNo != undefined && signNo != '' && "1" == isSign){//已签署
-            var _time1 = 0;
-            var showMsg = "";
-            var intervalID = setInterval(function() {
-                _time1++;
-                shr.callService({
-                    serviceName : 'electronicLaborRefreshLocalService',
-                    param : {
-                        contractNo : signNo,
-                        billId : billId,
-                        isDefault : "1"
-                    },
-                    async : false,
-                    success : function(response) {
-                        if(response&&response.code == 0){
-                            var pdfurl = '';
-                            pdfurl = response.data[0].sealInfo.previewOfPcUrl;
-
-                            var downloadUrl = response.data[0].sealInfo.downloadUrl;
-                            _self.convertPdfToWord(pdfurl,downloadUrl,"已盖章");
-                            shr.block.hide();
-                            // shr.openNew(pdfurl);
-                            clearInterval(intervalID);
-                        } else {
-                            if (msg != "") {
-                                showMsg = msg;
-                                return;
-                            } else {
-                                showMsg = jsBizMultLan.ssc_otherElectronicContractPreSignEdit_27063837_i18n_1;
-                                return;
-                            }
-                        }
-                    },
-                    error: function(xhr,data){
+        if("1" == isSign){//已签署
+            var newDate = new Date();
+				var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
+				var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
+				var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
+				var nowTime = hourStr+minuteStr+secondStr;
+				var contractNo = rowData.number;
+				shr.block.show();
+				shr.callService({
+					serviceName : 'empCreateCertificationService',
+					param : {
+						billId : billId,
+						posNum : nowTime
+					},
+					async : false,
+					success : function(response) {
+						console.log('createCertificationService success');
+						var _time3 = 0;
+						var showMsg = "";
+						var intervalID = setInterval(function() {
+							_time3++;
+							shr.callService({
+								serviceName : 'empPreViewECertificationV2Service',
+								param : {
+									contractNo : contractNo+"-"+nowTime,
+									billId : billId,
+									isDefault : "1"
+								},
+								async : false,
+								success : function(response) {
+									if (response.code == 0 && response.isSuccess) {
+										var returnUrl = response.returnUrl;
+										var pdfurl = _self.assemblePreViewUrl(returnUrl);
+										 _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
+									} else {
+										showMsg = response.msg;
+									}
+								},
+								error: function(xhr,data){
 
-                    }
-                });
-                if (_time1 > 10){
-                    clearInterval(intervalID);
-                    if (!showMsg || showMsg == "") {
-                        showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
-                    }
-                    shr.block.hide();
-                    shr.showError({
-                        message: showMsg
-                    });
-                }
-            }, 500);
+								}
+							});
+							if (_time3 > 10){
+								shr.block.hide();
+								if (showMsg == "") {
+									showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
+								}
+								shr.showError({
+									message: showMsg
+								});
+								clearInterval(intervalID);
+							}
+						}, 500);
+					},
+					error: function(xhr,data){
+						shr.showError({
+							message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
+						});
+						return;
+					}
+				});
             return;
         }else{
             var newDate = new Date();
-            var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
-            var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
-            var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
-            var nowTime = hourStr+minuteStr+secondStr;
-            var contractNo = rowData.number;
-            shr.block.show();
-            shr.callService({
-                serviceName : 'oldEmpCreateCertificationService',
-                param : {
-                    billId : billId,
-                    posNum : nowTime
-                },
-                async : false,
-                success : function(response) {
-                    console.log('createCertificationService success');
-                    var _time3 = 0;
-                    var showMsg = "";
-                    var intervalID = setInterval(function() {
-                        _time3++;
-                        shr.callService({
-                            serviceName : 'electronicLaborRefreshLocalService',
-                            param : {
-                                contractNo : contractNo+"-"+nowTime,
-                                billId : billId,
-                                isDefault : "1"
-                            },
-                            async : false,
-                            success : function(response) {
-                                if(response&&response.code == 0&&response.data[0]){
-                                    var pdfurl = '';
-                                    pdfurl = response.data[0].nosealInfo.previewOfPcUrl;
-                                    var downloadUrl = response.data[0].nosealInfo.downloadUrl;
-                                    _self.convertPdfToWord(pdfurl,downloadUrl,"未盖章");
-                                    shr.block.hide();
-                                    // shr.openNew(pdfurl);
-                                    clearInterval(intervalID);
-                                } else {
-                                    showMsg = response.msg;
-                                }
-                            },
-                            error: function(xhr,data){
+				var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
+				var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
+				var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
+				var nowTime = hourStr+minuteStr+secondStr;
+				var contractNo = rowData.number;
+				shr.block.show();
+				shr.callService({
+					serviceName : 'empCreateCertificationService',
+					param : {
+						billId : billId,
+						posNum : nowTime
+					},
+					async : false,
+					success : function(response) {
+						console.log('createCertificationService success');
+						var _time3 = 0;
+						var showMsg = "";
+						var intervalID = setInterval(function() {
+							_time3++;
+							shr.callService({
+								serviceName : 'empPreViewECertificationV2Service',
+								param : {
+									contractNo : contractNo+"-"+nowTime,
+									billId : billId,
+									isDefault : "1"
+								},
+								async : false,
+								success : function(response) {
+									if (response.code == 0 && response.isSuccess) {
+										var returnUrl = response.returnUrl;
 
-                            }
-                        });
-                        if (_time3 > 10){
-                            shr.customer.gtiit.HRCertificationBillListEx.superClass.previewPrintAction.call(_self);
-                            shr.block.hide();
-                            if (showMsg == "") {
-                                showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
-                            }
-                            shr.showError({
-                                message: showMsg
-                            });
-                            clearInterval(intervalID);
-                        }
-                    }, 500);
-                },
-                error: function(xhr,data){
-                    shr.showError({
-                        message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
-                    });
-                    return;
-                }
-            });
+										//shr.openNew(pdfurl);
+
+                                          // pdfurl = "https://gtiit.kdeascloud.com"+pdfurl;
+                                            //var downloadUrl = response.data[0].nosealInfo.downloadUrl;
+										_self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
+									} else {
+										showMsg = response.msg;
+									}
+								},
+								error: function(xhr,data){
+
+								}
+							});
+							if (_time3 > 20){
+								shr.block.hide();
+								if (showMsg == "") {
+									showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
+								}
+								shr.showError({
+									message: showMsg
+								});
+								clearInterval(intervalID);
+							}
+						}, 500);
+					},
+					error: function(xhr,data){
+						shr.showError({
+							message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
+						});
+						return;
+					}
+				});
         }
     },
-    convertPdfToWord: function(previewOfPcUrl, downloadUrl, isSign){
-        var _self = this;
-        previewOfPcUrl = decodeURIComponent(previewOfPcUrl);
-        const contractNo = _self.getContractParamsFromURL(previewOfPcUrl);
-        downloadUrl = encodeURIComponent(downloadUrl);
-        const date = new Date();
-        const year = date.getFullYear();
-        const month = (date.getMonth() + 1).toString().padStart(2, "0");
-        const day = date.getDate().toString().padStart(2, "0");
-        var currentDate = year+month+day;
-        var fileName = contractNo + isSign + "-" + currentDate + ".docx";
+	convertPdfToWord: function(contractNo, attachId, isSign,intervalID){
+		var _self = this;
 
-        var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
-        var downloadLink = document.createElement('a');
-        downloadLink.href = urlinner;
-        document.body.appendChild(downloadLink);
-        downloadLink.click();
-        document.body.removeChild(downloadLink);
-    },
+		//ownloadUrl = encodeURIComponent(downloadUrl);
+		const date = new Date();
+		const year = date.getFullYear();
+		const month = (date.getMonth() + 1).toString().padStart(2, "0");
+		const day = date.getDate().toString().padStart(2, "0");
+		var currentDate = year+month+day;
+		var fileName = contractNo + isSign + "-" + currentDate + ".docx";
+
+		//var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
+		//var downloadLink = document.createElement('a');
+		//downloadLink.href = urlinner;
+		//document.body.appendChild(downloadLink);
+		//downloadLink.click();
+		//document.body.removeChild(downloadLink);
+		shr.callHandler({
+			handler: "com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx",
+			action: "convertPdfToWord",
+			param: {
+				attachId: attachId,
+				fileName:fileName
+			},
+			type: "POST",
+			async:false,
+			success: function (res) {
+				if (res != null&&res.code=="ok") {
+					var pdfurl = _self.assembleDownloadUrl(attachId);
+					shr.openNew(pdfurl);
+					shr.block.hide();
+					clearInterval(intervalID);
+				}
+			}
+		});
+	},
+	assembleDownloadUrl:function(attachmentId, params) {
+		var _self = this;
+		var param = $.extend({
+			method: 'download',
+			id: attachmentId,
+			permItemId: shr.getCurrentPagePermItemId(),
+			billId:shr.getUrlRequestParam('billId'),
+			uipk:shr.getUrlRequestParam('uipk'),
+			assigmentId:shr.getAssignmentId(),
+			ProcInstId:shr.getProcInstId(),
+			msgId:shr.getMsgId(),
+			shruicode:shr.getShruicode()
+		}, params);
+		var url = shr.getContextPath() + '/attachmentUpload.do?' + $.param(param);
+		return url;
+	},
     getContractParamsFromURL: function(url){
         // 定义正则表达式
         const regex = /[?&]contractNo(=([^&#]*)|&|#|$)/;

+ 108 - 63
GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/HREmpCertificationBillHRListEx.js

@@ -93,54 +93,67 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
         var isSign = rowData.isSign; // 是否已签署
         var signNo = rowData.signNO;
         var billId = rowData.id;
-        if("2" == drawUpMode && signNo != null && signNo != undefined && signNo != '' && "1" == isSign){//已签署
-            var _time1 = 0;
-            var showMsg = "";
-            var intervalID = setInterval(function() {
-                _time1++;
-                shr.callService({
-                    serviceName : 'electronicLaborRefreshLocalService',
-                    param : {
-                        contractNo : signNo,
-                        billId : billId,
-                        isDefault : "1"
-                    },
-                    async : false,
-                    success : function(response) {
-                        if(response&&response.code == 0){
-                            var pdfurl = '';
-                            pdfurl = response.data[0].sealInfo.previewOfPcUrl;
+        if("1" == isSign){//已签署
+            var newDate = new Date();
+            var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
+            var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
+            var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
+            var nowTime = hourStr+minuteStr+secondStr;
+            var contractNo = rowData.number;
+            shr.block.show();
+            shr.callService({
+                serviceName : 'empCreateCertificationService',
+                param : {
+                    billId : billId,
+                    posNum : nowTime
+                },
+                async : false,
+                success : function(response) {
+                    console.log('createCertificationService success');
+                    var _time3 = 0;
+                    var showMsg = "";
+                    var intervalID = setInterval(function() {
+                        _time3++;
+                        shr.callService({
+                            serviceName : 'empPreViewECertificationV2Service',
+                            param : {
+                                contractNo : contractNo+"-"+nowTime,
+                                billId : billId,
+                                isDefault : "1"
+                            },
+                            async : false,
+                            success : function(response) {
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+                                    var pdfurl = _self.assemblePreViewUrl(returnUrl);
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
+                                } else {
+                                    showMsg = response.msg;
+                                }
+                            },
+                            error: function(xhr,data){
 
-                            var downloadUrl = response.data[0].sealInfo.downloadUrl;
-                            _self.convertPdfToWord(pdfurl,downloadUrl,"已盖章");
+                            }
+                        });
+                        if (_time3 > 10){
                             shr.block.hide();
-                            // shr.openNew(pdfurl);
-                            clearInterval(intervalID);
-                        } else {
-                            if (msg != "") {
-                                showMsg = msg;
-                                return;
-                            } else {
-                                showMsg = jsBizMultLan.ssc_otherElectronicContractPreSignEdit_27063837_i18n_1;
-                                return;
+                            if (showMsg == "") {
+                                showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
                             }
+                            shr.showError({
+                                message: showMsg
+                            });
+                            clearInterval(intervalID);
                         }
-                    },
-                    error: function(xhr,data){
-
-                    }
-                });
-                if (_time1 > 10){
-                    clearInterval(intervalID);
-                    if (!showMsg || showMsg == "") {
-                        showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
-                    }
-                    shr.block.hide();
+                    }, 500);
+                },
+                error: function(xhr,data){
                     shr.showError({
-                        message: showMsg
+                        message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
                     });
+                    return;
                 }
-            }, 500);
+            });
             return;
         }else{
             var newDate = new Date();
@@ -151,7 +164,7 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
             var contractNo = rowData.number;
             shr.block.show();
             shr.callService({
-                serviceName : 'oldEmpCreateCertificationService',
+                serviceName : 'empCreateCertificationService',
                 param : {
                     billId : billId,
                     posNum : nowTime
@@ -164,7 +177,7 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
                     var intervalID = setInterval(function() {
                         _time3++;
                         shr.callService({
-                            serviceName : 'electronicLaborRefreshLocalService',
+                            serviceName : 'empPreViewECertificationV2Service',
                             param : {
                                 contractNo : contractNo+"-"+nowTime,
                                 billId : billId,
@@ -172,14 +185,14 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
                             },
                             async : false,
                             success : function(response) {
-                                if(response&&response.code == 0&&response.data[0]){
-                                    var pdfurl = '';
-                                    pdfurl = response.data[0].nosealInfo.previewOfPcUrl;
-                                    var downloadUrl = response.data[0].nosealInfo.downloadUrl;
-                                    _self.convertPdfToWord(pdfurl,downloadUrl,"未盖章");
-                                    shr.block.hide();
-                                    // shr.openNew(pdfurl);
-                                    clearInterval(intervalID);
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+
+                                    //shr.openNew(pdfurl);
+
+                                    // pdfurl = "https://gtiit.kdeascloud.com"+pdfurl;
+                                    //var downloadUrl = response.data[0].nosealInfo.downloadUrl;
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
                                 } else {
                                     showMsg = response.msg;
                                 }
@@ -188,8 +201,7 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
 
                             }
                         });
-                        if (_time3 > 10){
-                            shr.customer.gtiit.HREmpCertificationBillHRListEx.superClass.previewPrintAction.call(_self);
+                        if (_time3 > 20){
                             shr.block.hide();
                             if (showMsg == "") {
                                 showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
@@ -210,11 +222,10 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
             });
         }
     },
-    convertPdfToWord: function(previewOfPcUrl, downloadUrl, isSign){
+    convertPdfToWord: function(contractNo, attachId, isSign,intervalID){
         var _self = this;
-        previewOfPcUrl = decodeURIComponent(previewOfPcUrl);
-        const contractNo = _self.getContractParamsFromURL(previewOfPcUrl);
-        downloadUrl = encodeURIComponent(downloadUrl);
+
+        //ownloadUrl = encodeURIComponent(downloadUrl);
         const date = new Date();
         const year = date.getFullYear();
         const month = (date.getMonth() + 1).toString().padStart(2, "0");
@@ -222,12 +233,46 @@ shr.defineClass("shr.empcertification.HREmpCertificationBillHRListEx", shr.empce
         var currentDate = year+month+day;
         var fileName = contractNo + isSign + "-" + currentDate + ".docx";
 
-        var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
-        var downloadLink = document.createElement('a');
-        downloadLink.href = urlinner;
-        document.body.appendChild(downloadLink);
-        downloadLink.click();
-        document.body.removeChild(downloadLink);
+        //var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
+        //var downloadLink = document.createElement('a');
+        //downloadLink.href = urlinner;
+        //document.body.appendChild(downloadLink);
+        //downloadLink.click();
+        //document.body.removeChild(downloadLink);
+        shr.callHandler({
+            handler: "com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx",
+            action: "convertPdfToWord",
+            param: {
+                attachId: attachId,
+                fileName:fileName
+            },
+            type: "POST",
+            async:false,
+            success: function (res) {
+                if (res != null&&res.code=="ok") {
+                    var pdfurl = _self.assembleDownloadUrl(attachId);
+                    shr.openNew(pdfurl);
+                    shr.block.hide();
+                    clearInterval(intervalID);
+                }
+            }
+        });
+    },
+    assembleDownloadUrl:function(attachmentId, params) {
+        var _self = this;
+        var param = $.extend({
+            method: 'download',
+            id: attachmentId,
+            permItemId: shr.getCurrentPagePermItemId(),
+            billId:shr.getUrlRequestParam('billId'),
+            uipk:shr.getUrlRequestParam('uipk'),
+            assigmentId:shr.getAssignmentId(),
+            ProcInstId:shr.getProcInstId(),
+            msgId:shr.getMsgId(),
+            shruicode:shr.getShruicode()
+        }, params);
+        var url = shr.getContextPath() + '/attachmentUpload.do?' + $.param(param);
+        return url;
     },
     getContractParamsFromURL: function(url){
         // 定义正则表达式

+ 108 - 63
GDYSL/js/deploy/easweb.ear/shr_web.war/addon/customer/web/js/HRResignCertificationBillHRListEx.js

@@ -93,54 +93,67 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
         var isSign = rowData.isSign; // 是否已签署
         var signNo = rowData.signNO;
         var billId = rowData.id;
-        if("2" == drawUpMode && signNo != null && signNo != undefined && signNo != '' && "1" == isSign){//已签署
-            var _time1 = 0;
-            var showMsg = "";
-            var intervalID = setInterval(function() {
-                _time1++;
-                shr.callService({
-                    serviceName : 'electronicLaborRefreshLocalService',
-                    param : {
-                        contractNo : signNo,
-                        billId : billId,
-                        isDefault : "1"
-                    },
-                    async : false,
-                    success : function(response) {
-                        if(response&&response.code == 0){
-                            var pdfurl = '';
-                            pdfurl = response.data[0].sealInfo.previewOfPcUrl;
+        if("1" == isSign){//已签署
+            var newDate = new Date();
+            var hourStr = newDate.getHours()<10?"0"+newDate.getHours().toString():newDate.getHours().toString();
+            var minuteStr = newDate.getMinutes()<10?"0"+newDate.getMinutes().toString():newDate.getMinutes().toString();
+            var secondStr = newDate.getSeconds()<10?"0"+newDate.getSeconds().toString():newDate.getSeconds().toString();
+            var nowTime = hourStr+minuteStr+secondStr;
+            var contractNo = rowData.number;
+            shr.block.show();
+            shr.callService({
+                serviceName : 'empCreateCertificationService',
+                param : {
+                    billId : billId,
+                    posNum : nowTime
+                },
+                async : false,
+                success : function(response) {
+                    console.log('createCertificationService success');
+                    var _time3 = 0;
+                    var showMsg = "";
+                    var intervalID = setInterval(function() {
+                        _time3++;
+                        shr.callService({
+                            serviceName : 'empPreViewECertificationV2Service',
+                            param : {
+                                contractNo : contractNo+"-"+nowTime,
+                                billId : billId,
+                                isDefault : "1"
+                            },
+                            async : false,
+                            success : function(response) {
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+                                    var pdfurl = _self.assemblePreViewUrl(returnUrl);
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
+                                } else {
+                                    showMsg = response.msg;
+                                }
+                            },
+                            error: function(xhr,data){
 
-                            var downloadUrl = response.data[0].sealInfo.downloadUrl;
-                            _self.convertPdfToWord(pdfurl,downloadUrl,"已盖章");
+                            }
+                        });
+                        if (_time3 > 10){
                             shr.block.hide();
-                            // shr.openNew(pdfurl);
-                            clearInterval(intervalID);
-                        } else {
-                            if (msg != "") {
-                                showMsg = msg;
-                                return;
-                            } else {
-                                showMsg = jsBizMultLan.ssc_otherElectronicContractPreSignEdit_27063837_i18n_1;
-                                return;
+                            if (showMsg == "") {
+                                showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
                             }
+                            shr.showError({
+                                message: showMsg
+                            });
+                            clearInterval(intervalID);
                         }
-                    },
-                    error: function(xhr,data){
-
-                    }
-                });
-                if (_time1 > 10){
-                    clearInterval(intervalID);
-                    if (!showMsg || showMsg == "") {
-                        showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
-                    }
-                    shr.block.hide();
+                    }, 500);
+                },
+                error: function(xhr,data){
                     shr.showError({
-                        message: showMsg
+                        message: jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13
                     });
+                    return;
                 }
-            }, 500);
+            });
             return;
         }else{
             var newDate = new Date();
@@ -151,7 +164,7 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
             var contractNo = rowData.number;
             shr.block.show();
             shr.callService({
-                serviceName : 'oldEmpCreateCertificationService',
+                serviceName : 'empCreateCertificationService',
                 param : {
                     billId : billId,
                     posNum : nowTime
@@ -164,7 +177,7 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
                     var intervalID = setInterval(function() {
                         _time3++;
                         shr.callService({
-                            serviceName : 'electronicLaborRefreshLocalService',
+                            serviceName : 'empPreViewECertificationV2Service',
                             param : {
                                 contractNo : contractNo+"-"+nowTime,
                                 billId : billId,
@@ -172,14 +185,14 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
                             },
                             async : false,
                             success : function(response) {
-                                if(response&&response.code == 0&&response.data[0]){
-                                    var pdfurl = '';
-                                    pdfurl = response.data[0].nosealInfo.previewOfPcUrl;
-                                    var downloadUrl = response.data[0].nosealInfo.downloadUrl;
-                                    _self.convertPdfToWord(pdfurl,downloadUrl,"未盖章");
-                                    shr.block.hide();
-                                    // shr.openNew(pdfurl);
-                                    clearInterval(intervalID);
+                                if (response.code == 0 && response.isSuccess) {
+                                    var returnUrl = response.returnUrl;
+
+                                    //shr.openNew(pdfurl);
+
+                                    // pdfurl = "https://gtiit.kdeascloud.com"+pdfurl;
+                                    //var downloadUrl = response.data[0].nosealInfo.downloadUrl;
+                                    _self.convertPdfToWord(contractNo+"-"+nowTime,returnUrl,"未盖章",intervalID);
                                 } else {
                                     showMsg = response.msg;
                                 }
@@ -188,8 +201,7 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
 
                             }
                         });
-                        if (_time3 > 10){
-                            shr.customer.gtiit.HRResignCertificationBillHRListEx.superClass.previewPrintAction.call(_self);
+                        if (_time3 > 20){
                             shr.block.hide();
                             if (showMsg == "") {
                                 showMsg = jsBizMultLan.emp_HRCertificationBillList_28243376_i18n_13;
@@ -210,11 +222,10 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
             });
         }
     },
-    convertPdfToWord: function(previewOfPcUrl, downloadUrl, isSign){
+    convertPdfToWord: function(contractNo, attachId, isSign,intervalID){
         var _self = this;
-        previewOfPcUrl = decodeURIComponent(previewOfPcUrl);
-        const contractNo = _self.getContractParamsFromURL(previewOfPcUrl);
-        downloadUrl = encodeURIComponent(downloadUrl);
+
+        //ownloadUrl = encodeURIComponent(downloadUrl);
         const date = new Date();
         const year = date.getFullYear();
         const month = (date.getMonth() + 1).toString().padStart(2, "0");
@@ -222,12 +233,46 @@ shr.defineClass("shr.empcertification.HRResignCertificationBillHRListEx", shr.em
         var currentDate = year+month+day;
         var fileName = contractNo + isSign + "-" + currentDate + ".docx";
 
-        var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
-        var downloadLink = document.createElement('a');
-        downloadLink.href = urlinner;
-        document.body.appendChild(downloadLink);
-        downloadLink.click();
-        document.body.removeChild(downloadLink);
+        //var urlinner = shr.getContextPath() + shr.dynamicURL + "?downloadUrl="+downloadUrl+"&fileName="+fileName+"&method=convertPdfToWord&handler=com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx"+"&uipk="+shr.getUrlRequestParam('uipk');
+        //var downloadLink = document.createElement('a');
+        //downloadLink.href = urlinner;
+        //document.body.appendChild(downloadLink);
+        //downloadLink.click();
+        //document.body.removeChild(downloadLink);
+        shr.callHandler({
+            handler: "com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx",
+            action: "convertPdfToWord",
+            param: {
+                attachId: attachId,
+                fileName:fileName
+            },
+            type: "POST",
+            async:false,
+            success: function (res) {
+                if (res != null&&res.code=="ok") {
+                    var pdfurl = _self.assembleDownloadUrl(attachId);
+                    shr.openNew(pdfurl);
+                    shr.block.hide();
+                    clearInterval(intervalID);
+                }
+            }
+        });
+    },
+    assembleDownloadUrl:function(attachmentId, params) {
+        var _self = this;
+        var param = $.extend({
+            method: 'download',
+            id: attachmentId,
+            permItemId: shr.getCurrentPagePermItemId(),
+            billId:shr.getUrlRequestParam('billId'),
+            uipk:shr.getUrlRequestParam('uipk'),
+            assigmentId:shr.getAssignmentId(),
+            ProcInstId:shr.getProcInstId(),
+            msgId:shr.getMsgId(),
+            shruicode:shr.getShruicode()
+        }, params);
+        var url = shr.getContextPath() + '/attachmentUpload.do?' + $.param(param);
+        return url;
     },
     getContractParamsFromURL: function(url){
         // 定义正则表达式

+ 151 - 94
GDYSL/websrc/com/kingdee/shr/customer/gtiit/handler/HRcertificationbillListHandlerEx.java

@@ -1,119 +1,176 @@
 package com.kingdee.shr.customer.gtiit.handler;
 
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.springframework.ui.ModelMap;
-
 import com.aspose.pdf.DocSaveOptions;
 import com.aspose.pdf.Document;
 import com.aspose.pdf.SaveFormat;
-import com.kingdee.bos.BOSException;
+import com.kingdee.bos.Context;
+import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
+import com.kingdee.eas.base.attachment.AttachmentFactory;
+import com.kingdee.eas.base.attachment.AttachmentInfo;
+import com.kingdee.eas.base.attachment.IAttachment;
+import com.kingdee.shr.base.syssetting.context.SHRContext;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
+import com.kingdee.shr.base.syssetting.web.json.JSONUtils;
 import com.kingdee.shr.empCertification.web.handler.HRcertificationbillListHandler;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.ui.ModelMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class HRcertificationbillListHandlerEx extends HRcertificationbillListHandler{
 
 	private static Logger logger =
 	        Logger.getLogger("com.kingdee.shr.customer.gtiit.handler.HRcertificationbillListHandlerEx");
-	
+	//更新
 	public void convertPdfToWordAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
-		logger.error("杩涘叆闄勪欢杞�崲鏂规硶"); 
-		String downloadUrl = request.getParameter("downloadUrl");
-		downloadUrl = downloadUrl.replace(" ", "+");
-		String fileName = request.getParameter("fileName"); 
-		logger.error("闄勪欢涓嬭浇璺�緞锛�"+downloadUrl);
-		logger.error("闄勪欢鍚嶇О锛�"+fileName);
-		File attachFile = null;
+		logger.error("进入附件转换方法");
+		String attachId = request.getParameter("attachId");
+		Map<String,Object> map = new HashMap<>();
+		String fileName = request.getParameter("fileName");
+		logger.error("附件下载路径:"+attachId);
+		logger.error("附件名称:"+fileName);
+		Document doc= null;
+		ByteArrayInputStream fileInputStream= null;
+		ByteArrayOutputStream byteOutputStream= null;
 		try {
-			// 鍒涘缓 URL 瀵硅薄 
-            URL url = new URL(downloadUrl);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            // 璁剧疆瓒呮椂鏃堕棿涓�100绉�
-            conn.setConnectTimeout(100 * 1000);
-            // 寰楀埌杈撳叆娴�
-            InputStream inputStream = conn.getInputStream();
-            // 鍒涘缓鏂囦欢杈撳嚭娴�
-            attachFile = File.createTempFile("temp", ".pdf");
-            // 灏嗚緭鍏ユ祦涓�殑鏁版嵁鍐欏叆涓存椂鏂囦欢
-            FileOutputStream outputStream = new FileOutputStream(attachFile);
-            // 璇诲彇杈撳叆娴佷腑鐨勬暟鎹�苟鍐欏叆杈撳嚭娴�
-            byte[] buffer = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, bytesRead);
+			Context ctx = SHRContext.getInstance().getContext();
+			IAttachment attachment = AttachmentFactory.getLocalInstance(ctx);
+			AttachmentInfo info = attachment.getAttachmentInfo(new ObjectUuidPK(attachId));
+
+			 fileInputStream = new ByteArrayInputStream(info.getFile());
+			// 创建输出流
+			 byteOutputStream = new ByteArrayOutputStream();
+			//doc是将要被转化的word文档
+			 doc = new Document(fileInputStream);
+			//全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换
+			// 创建 Word 保存选项
+			DocSaveOptions options = new DocSaveOptions();
+			// 设置输出格式为 DOCX
+			options.setFormat(DocSaveOptions.DocFormat.DocX);
+			doc.save(byteOutputStream, options);
+			info.setSimpleName("docx");
+			info.setType("Microsoft Word Doc");
+			if(StringUtils.isNotBlank(fileName)) {
+				String name = fileName.replace(".docx","");
+				info.setName(name);
+			}
+			info.setFile(byteOutputStream.toByteArray());
+			attachment.save(info);
+			map.put("code","ok");
+			map.put("msg","ok");
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("附件类型转换失败:"+e.getMessage());
+			map.put("code","err");
+			map.put("msg",e.getMessage());
+		}finally {
+            if(doc != null)doc.close();
+            try {
+				if(fileInputStream != null) fileInputStream.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            try {
+				if(byteOutputStream != null) byteOutputStream.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
-            // 鍏抽棴娴�
-            inputStream.close();
-            outputStream.close();
-            
-			FileInputStream fileInputStream = new FileInputStream(attachFile);
-            // 鍒涘缓杈撳嚭娴�
-            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
-            //doc鏄�皢瑕佽�杞�寲鐨剋ord鏂囨。
-            Document doc = new Document(fileInputStream);
-            //鍏ㄩ潰鏀�寔DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 鐩镐簰杞�崲
-            doc.save(byteOutputStream, SaveFormat.DocX);
-            // 灏� ByteArrayOutputStream 杞�崲涓� InputStream
-            InputStream input = new ByteArrayInputStream(byteOutputStream.toByteArray());
-            
-            try (BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream())) {
-//    			//閫氱煡娴忚�鍣ㄤ互闄勪欢褰㈠紡涓嬭浇
-    			response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
-    			//鏂囦欢杈撳嚭鏍煎紡
-    			response.setContentType("multipart/form-data;charset=utf-8");
-    			byte[] car = new byte[1024];
-    			int len;
-    			while ((len = input.read(car)) != -1) {
-    				out.write(car, 0, len);
-    			}
-    		} catch (IOException e) {
-    			e.getMessage();
-    		}
-            doc.close();
-            fileInputStream.close();
-            byteOutputStream.close();
-			
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("闄勪欢绫诲瀷杞�崲澶辫触锛�"+e.getMessage());
         }
-		if(attachFile != null) {
-			attachFile.deleteOnExit();
-			attachFile.delete();
-		}
+		JSONUtils.SUCCESS(map);
 	}
+
+//	public void convertPdfToWordAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
+//		logger.error("进入附件转换方法");
+//		String downloadUrl = request.getParameter("downloadUrl");
+//		downloadUrl = downloadUrl.replace(" ", "+");
+//		String fileName = request.getParameter("fileName");
+//		logger.error("附件下载路径:"+downloadUrl);
+//		logger.error("附件名称:"+fileName);
+//		File attachFile = null;
+//		try {
+//			// 创建 URL 对象
+//            URL url = new URL(downloadUrl);
+//            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+//            // 设置超时时间为100秒
+//            conn.setConnectTimeout(100 * 1000);
+//            // 得到输入流
+//            InputStream inputStream = conn.getInputStream();
+//            // 创建文件输出流
+//            attachFile = File.createTempFile("temp", ".pdf");
+//            // 将输入流中的数据写入临时文件
+//            FileOutputStream outputStream = new FileOutputStream(attachFile);
+//            // 读取输入流中的数据并写入输出流
+//            byte[] buffer = new byte[4096];
+//            int bytesRead;
+//            while ((bytesRead = inputStream.read(buffer)) != -1) {
+//                outputStream.write(buffer, 0, bytesRead);
+//            }
+//            // 关闭流
+//            inputStream.close();
+//            outputStream.close();
+//
+//			FileInputStream fileInputStream = new FileInputStream(attachFile);
+//            // 创建输出流
+//            ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
+//            //doc是将要被转化的word文档
+//
+//            Document doc = new Document(fileInputStream);
+//            //全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换
+//            doc.save(byteOutputStream, SaveFormat.DocX);
+//            // 将 ByteArrayOutputStream 转换为 InputStream
+//            InputStream input = new ByteArrayInputStream(byteOutputStream.toByteArray());
+//
+//            try (BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream())) {
+////    			//通知浏览器以附件形式下载
+//    			response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
+//    			//文件输出格式
+//    			response.setContentType("multipart/form-data;charset=utf-8");
+//    			byte[] car = new byte[1024];
+//    			int len;
+//    			while ((len = input.read(car)) != -1) {
+//    				out.write(car, 0, len);
+//    			}
+//    		} catch (IOException e) {
+//    			e.getMessage();
+//    		}
+//            doc.close();
+//            fileInputStream.close();
+//            byteOutputStream.close();
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            logger.error("附件类型转换失败:"+e.getMessage());
+//        }
+//		if(attachFile != null) {
+//			attachFile.deleteOnExit();
+//			attachFile.delete();
+//		}
+//	}
 	
 	/*public void convertPdfToWordAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
-		logger.error("杩涘叆闄勪欢杞�崲鏂规硶");
+		logger.error("进入附件转换方法");
 		String downloadUrl = request.getParameter("downloadUrl");
 		downloadUrl = downloadUrl.replace(" ", "+");
 		String fileName = request.getParameter("fileName"); 
-		logger.error("闄勪欢涓嬭浇璺�緞锛�"+downloadUrl);
-		logger.error("闄勪欢鍚嶇О锛�"+fileName);
+		logger.error("附件下载路径:"+downloadUrl);
+		logger.error("附件名称:"+fileName);
 		try {
 			URL url = new URL(downloadUrl);
 	        HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
 	        int responseCode = httpConn.getResponseCode();
-	        // 妫€鏌ユ槸鍚︽垚鍔熻繛鎺ュ埌鏂囦欢
+	        // 检查是否成功连接到文件
 	        if (responseCode == HttpURLConnection.HTTP_OK) {
 	            InputStream inputStream = url.openStream();
 	            
 	            File tempFile = File.createTempFile("temp", ".pdf");
-	            // 灏嗚緭鍏ユ祦涓�殑鏁版嵁鍐欏叆涓存椂鏂囦欢
+	            // 将输入流中的数据写入临时文件
 	            FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
 	            byte[] buffer = new byte[1024];
 	            int bytesRead;
@@ -125,23 +182,23 @@ public class HRcertificationbillListHandlerEx extends HRcertificationbillListHan
 	            InputStream fileInputStream = new FileInputStream(tempFile.getPath());
 	            tempFile.deleteOnExit();
 	            tempFile.delete();
-	            // 鍒涘缓杈撳嚭娴�
+	            // 创建输出流
 	            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-	            //doc鏄�皢瑕佽�杞�寲鐨剋ord鏂囨。
+	            //doc是将要被转化的word文档
 	            Document doc = new Document(fileInputStream);
-	            //鍏ㄩ潰鏀�寔DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 鐩镐簰杞�崲
+	            //全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换
 	            DocSaveOptions saveOptions = new DocSaveOptions();
 	            doc.save(outputStream, saveOptions);
-	            // 灏� ByteArrayOutputStream 杞�崲涓� InputStream
+	            // 将 ByteArrayOutputStream 转换为 InputStream
 	            InputStream input = new ByteArrayInputStream(outputStream.toByteArray());
 	            
 	            doc.close();
 	            inputStream.close();
 	            
 	            try (BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream())) {
-//	    			//閫氱煡娴忚�鍣ㄤ互闄勪欢褰㈠紡涓嬭浇
+//	    			//通知浏览器以附件形式下载
 	    			response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
-	    			//鏂囦欢杈撳嚭鏍煎紡
+	    			//文件输出格式
 	    			response.setContentType("multipart/form-data;charset=utf-8");
 	    			byte[] car = new byte[1024];
 	    			int len;
@@ -154,12 +211,12 @@ public class HRcertificationbillListHandlerEx extends HRcertificationbillListHan
 	            input.close();
 	            outputStream.close();
 	        }else {
-	        	logger.error("闄勪欢璺�緞杞�崲寮傚父");
+	        	logger.error("附件路径转换异常");
 	        }
             
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("闄勪欢绫诲瀷杞�崲澶辫触锛�"+e.getMessage());
+            logger.error("附件类型转换失败:"+e.getMessage());
         }
 		
 	}*/