|
@@ -993,6 +993,7 @@ module.exports = app => {
|
|
|
}
|
|
|
}
|
|
|
const advanceAuditList = await ctx.service.advanceAudit.getAuditAdvanceByTender(params.tender_id);
|
|
|
+ // let maxTimes = -1;
|
|
|
advanceAuditList.forEach(advAudit => {
|
|
|
if (advAudit.vid === params.advance_id) {
|
|
|
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 });
|
|
@@ -1007,6 +1008,19 @@ module.exports = app => {
|
|
|
}
|
|
|
}
|
|
|
const materialAdjAuditList = await ctx.service.materialAudit.getAuditorsByTender(params.tender_id);
|
|
|
+ let maxTimes = -1;
|
|
|
+ // let orgTime = null;
|
|
|
+ materialAdjAuditList.forEach(material => {
|
|
|
+ if (material.mid === params.material_id) {
|
|
|
+ if (material.times > maxTimes) {
|
|
|
+ maxTimes = material.times;
|
|
|
+ if (material.order === 1) {
|
|
|
+ // orgTime = material.begin_time;
|
|
|
+ stgAudit[0].end_time = material.begin_time;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
materialAdjAuditList.forEach(material => {
|
|
|
if (material.mid === params.material_id) {
|
|
|
stgAudit.push({ aid: material.aid, status: material.status, opinion: material.opinion, end_time: material.end_time, order: material.order }); // 加上原报
|