Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/ledger_audit.js

@@ -386,7 +386,7 @@ module.exports = app => {
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, tenderId, times];
             const result = await this.db.query(sql, sqlParam);
             for (const r of result) {
-                const auditor = await this.getDataByCondition({tender_id: tenderId, times: r.times, audit_order: r.max_order});
+                const auditor = await this.getDataByCondition({tender_id: tenderId, audit_id: r.audit_id, times: r.times, audit_order: r.max_order});
                 r.status = auditor.status;
                 r.opinion = auditor.opinion;
                 r.begin_time = auditor.begin_time;

app/service/material_audit.js

@@ -91,7 +91,7 @@ module.exports = app => {
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, materialId, times];
             const result = await this.db.query(sql, sqlParam);
             for (const r of result) {
-                const auditor = await this.getDataByCondition({mid: materialId, times: r.times, order: r.max_order});
+                const auditor = await this.getDataByCondition({mid: materialId, aid: r.aid, times: r.times, order: r.max_order});
                 r.status = auditor.status;
                 r.opinion = auditor.opinion;
                 r.begin_time = auditor.begin_time;

app/service/stage_audit.js

@@ -2074,7 +2074,7 @@ module.exports = app => {
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, times];
             const result = await this.db.query(sql, sqlParam);
             for (const r of result) {
-                const auditor = await this.getDataByCondition({sid: stageId, times: r.times, order: r.max_order});
+                const auditor = await this.getDataByCondition({sid: stageId, aid: r.aid, times: r.times, order: r.max_order});
                 r.order = auditor.order;
                 r.status = auditor.status;
                 r.opinion = auditor.opinion;