预付款、材差表签字取审核的意见+日期

app/controller/report_controller.js

@@ -988,14 +988,14 @@ module.exports = app => {
                     const advanceList = await ctx.service.advance.getAdvanceListDirectly(params.tender_id);
                     for (const advance of advanceList) {
                         if (advance.id === params.advance_id) {
-                            stgAudit.push({ aid: advance.uid, status: advance.status, opinion: '同意', end_time: advance.end_time, order: 0 }); // 加上原报
+                            stgAudit.push({ aid: advance.uid, status: 3, opinion: '同意', end_time: advance.end_time || (new Date()), order: 0 }); // 加上原报，默认status为3
                             break;
                         }
                     }
                     const advanceAuditList = await ctx.service.advanceAudit.getAuditAdvanceByTender(params.tender_id);
                     advanceAuditList.forEach(advAudit => {
                         if (advAudit.vid === params.advance_id) {
-                            stgAudit.push({ aid: advAudit.autdit_id, status: advAudit.status, opinion: advAudit.opinion, end_time: advAudit.end_time, times: advAudit.times, order: advAudit.order });
+                            stgAudit.push({ aid: advAudit.audit_id, status: advAudit.status, opinion: advAudit.opinion || '同意', end_time: advAudit.end_time || (new Date()), times: advAudit.times, order: advAudit.order });
                         }
                     });
                     break;
@@ -1003,7 +1003,7 @@ module.exports = app => {
                     const materialList = await ctx.service.material.getValidMaterials(params.tender_id);
                     for (const material of materialList) {
                         if (material.id === params.material_id) {
-                            stgAudit.push({ aid: material.user_id, status: material.status, opinion: '同意', end_time: material.in_time, order: 0 }); // 加上原报
+                            stgAudit.push({ aid: material.user_id, status: 3, opinion: '同意', end_time: material.in_time, order: 0 }); // 加上原报，默认status为3
                         }
                     }
                     const materialAdjAuditList = await ctx.service.materialAudit.getAuditorsByTender(params.tender_id);
@@ -1075,7 +1075,7 @@ module.exports = app => {
                     const payment = paymentDetailList[0];
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                 }
-            } else if ([-300, -301, -302, -303].includes(params.stage_id)) {
+            } else if ([-300, -301, -302, -303, -400, -500].includes(params.stage_id)) {
                 // 变更令相关的
                 stgAudit = [];
                 stgAuditForOrg = [];
@@ -1202,7 +1202,7 @@ module.exports = app => {
                     const payment = paymentDetailList[0];
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                 }
-            } else if ([-300, -301, -302, -303].includes(params.stage_id)) {
+            } else if ([-300, -301, -302, -303, -400, -500].includes(params.stage_id)) {
                 stgAudit = [];
                 await this._commonGetAudit(ctx, params, stgAudit);
                 this._mergeBlankRoleSignDate(roleRel, stgAudit);