Browse Source

存在清单,标记为父项,却又没有子项时,计算错误

MaiXinRong 5 years ago
parent
commit
716ffdef19
3 changed files with 4 additions and 4 deletions
  1. 2 2
      app/controller/tender_controller.js
  2. 1 1
      app/service/ledger_audit.js
  3. 1 1
      app/service/revise_audit.js

+ 2 - 2
app/controller/tender_controller.js

@@ -42,7 +42,7 @@ module.exports = app => {
                 for (const t of tenderList) {
                     if (t.user_id === this.ctx.session.sessionUser.accountId && (
                         t.ledger_status === auditConst.ledger.status.checkNo || t.ledger_status === auditConst.ledger.status.uncheck)) {
-                        const sum = await this.ctx.service.ledger.addUp({tender_id: t.id, is_leaf: true});
+                        const sum = await this.ctx.service.ledger.addUp({tender_id: t.id/*, is_leaf: true*/});
                         t.total_price = sum.total_price;
                         t.deal_tp = sum.deal_tp;
                     }
@@ -288,7 +288,7 @@ module.exports = app => {
                 const tender = ctx.tender.data;
                 if (tender.user_id === this.ctx.session.sessionUser.accountId && (
                     tender.ledger_status === auditConst.ledger.status.checkNo || tender.ledger_status === auditConst.ledger.status.uncheck)) {
-                    const sum = await this.ctx.service.ledger.addUp({tender_id: tender.id, is_leaf: true});
+                    const sum = await this.ctx.service.ledger.addUp({tender_id: tender.id/*, is_leaf: true*/});
                     tender.total_price = sum.total_price;
                     tender.deal_tp = sum.deal_tp;
                 }

+ 1 - 1
app/service/ledger_audit.js

@@ -203,7 +203,7 @@ module.exports = app => {
             if (!audit) {
                 throw '审核人信息错误';
             }
-            const sum = await this.ctx.service.ledger.addUp({tender_id: tenderId, is_leaf: true});
+            const sum = await this.ctx.service.ledger.addUp({tender_id: tenderId/*, is_leaf: true*/});
 
             const transaction = await this.db.beginTransaction();
             try {

+ 1 - 1
app/service/revise_audit.js

@@ -291,7 +291,7 @@ module.exports = app => {
                             {id: lastStage.id, cache_time_l: cacheTime, cache_time_r: cacheTime});
                         // 拷贝修订数据至台账
                         await this._replaceLedgerByRevise(transaction, revise);
-                        const sum = await this.ctx.service.reviseBills.addUp({tender_id: revise.tid, is_leaf: true});
+                        const sum = await this.ctx.service.reviseBills.addUp({tender_id: revise.tid/*, is_leaf: true*/});
                         await transaction.update(this.ctx.service.tender.tableName, {
                             id: revise.tid, total_price: sum.total_price, deal_tp: sum.deal_tp
                         });