BUG #3633

app/controller/report_controller.js

@@ -1098,16 +1098,28 @@ module.exports = app => {
                 stgAudit = [];
                 switch (params.stage_id) {
                     case -300:
-                        const changeAudit = await ctx.service.changeAudit.getAuditors(params.change_id, params.change_times);
+                        const changeAudit = await ctx.service.changeAudit.getAuditors(params.change_id, params.change_times, true);
                         changeAudit.forEach(audit => {
-                            stgAudit.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time });
+                            stgAudit.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time, order: audit.usite });
                         });
                         break;
-                    case -301:
+                    case -301: // 变更方案
+                        const changePlanAudit = await ctx.service.changePlanAudit.getAuditors(params.business_id, params.change_plan_times, true);
+                        changePlanAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
+                        });
                         break;
-                    case -302:
+                    case -302: // 变更立项
+                        const changeProjectAudit = await ctx.service.changeProjectAudit.getAuditors(params.business_id, params.change_project_times, true);
+                        changeProjectAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
+                        });
                         break;
-                    case -303:
+                    case -303: // 变更申请
+                        const changeApplyAudit = await ctx.service.changeApplyAudit.getAuditors(params.business_id, params.change_apply_times, true);
+                        changeApplyAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
+                        });
                         break;
                     default:
                         break;
@@ -1695,8 +1707,8 @@ function mergeTextSignature(isTxtSignature, status, pageData, singleRoleRel, rpt
                         dftRolRel = roleRel;
                     }
                 }
-                // console.log(dftRolRel);
-                _mergeSingle(dtlPage, dftRolRel, true, status !== 3);
+                // _mergeSingle(dtlPage, dftRolRel, true, status !== 3);
+                _mergeSingle(dtlPage, dftRolRel, false, status !== 3); // 因加了个标记(归档不输出签名)，前端做了大量的签名处理工作，导致现在不能删除，否则还会出现遗漏
             });
         } else {
             _mergeSingle(pageData, singleRoleRel, false, status !== 3);