修复标段&期归档失败问题

app/controller/report_controller.js

@@ -662,7 +662,7 @@ module.exports = app => {
                         if (changes[cIdx].status === 3) {
                             const changeAudit = await ctx.service.changeAudit.getLastUser(changeId, changes[cIdx].times, 3);
                             if (changeAudit) {
-                                lastAuditor = { end_time: changeAudit.sin_time };
+                                lastAuditor = { end_time: changeAudit.sin_time, sdesc: changeAudit.sdesc };
                             }
                         }
                         break;
@@ -1108,26 +1108,7 @@ module.exports = app => {
             await this.ctx.helper.recursiveMkdirSync(baseDir + '/app/public/download');
 
             const runnableRst = [];
-            /*
-            for (let idx = 0; idx < pageRstArr.length; idx++) {
-                let roleRel = null;
-                for (const roleR of roleRelArr) {
-                    if (roleR.rpt_id === params.rpt_ids[idx]) {
-                        roleRel = JSON.parse(roleR.rel_content);
-                        break;
-                    }
-                }
-                // console.log('roleRel.rel_content: ' + roleRel.rel_content);
-                // fsUtil.writeObjToFile(pageRstArr, 'D:/GitHome/temp/testBuiltPageResult.jsp');
-                if (params.stage_status === 3) {
-                    mergeSignAudit(pageRstArr[idx], roleRel, stgAudit);
-                    mergeSignDate(pageRstArr[idx], params.stage_id, roleRel, stgAudit, stgAuditForOrg, stageList);
-                }
-                runnableRst.push(getExcelByPageData(pageRstArr[idx], params.rpt_names[idx], roleRel));
-            }
-            /*/
             // 1. merge签名相关信息
-            // const pageBrkSize = 6291456; // 6M, 1024*1024*6
             const pageBrkSize = 62914560; // 60M, 1024*1024*6*10
             for (let idx = 0; idx < pageRstArr.length; idx++) {
                 let roleRel = null;

app/public/report/js/rpt_archive.js

@@ -667,7 +667,7 @@ let rptArchiveObj = {
         }
     },
     _getBusinessId: function() {
-        let rst = '';
+        let rst = '-1';
         switch (current_stage_id) {
             case -300: // 变更令
                 rst = encodeURIComponent(CHNAGE_ID);