Browse Source

汇总标段信息,签约清单金额

MaiXinRong 5 years ago
parent
commit
445c21d02a
2 changed files with 3 additions and 2 deletions
  1. 1 1
      app/service/deal_bills.js
  2. 2 1
      app/service/rpt_gather_memory.js

+ 1 - 1
app/service/deal_bills.js

@@ -25,7 +25,7 @@ module.exports = app => {
                 '  From ' + this.tableName +
                 '  WHERE `tender_id` = ? ';
             const sqlParam = [tenderId];
-            return await this.db.query(sql, sqlParam);
+            return await this.db.queryOne(sql, sqlParam);
         }
 
         /**

+ 2 - 1
app/service/rpt_gather_memory.js

@@ -408,7 +408,8 @@ module.exports = app => {
                 deal_tp: tender.deal_tp,
                 tp: tender.total_price
             };
-            info.deal_bills_tp = await this.ctx.service.dealBills.getSum(tender.id);
+            const deal_bills_sum = await this.ctx.service.dealBills.getSum(tender.id);
+            info.deal_bills_tp = deal_bills_sum ? deal_bills_sum.total_price : 0;
             if (tender.ledger_status === auditConst.ledger.status.uncheck || tender.ledger_status === auditConst.ledger.status.checkNo) {
                 const sum = await this.ctx.service.ledger.addUp({tender_id: tender.id/*, is_leaf: true*/});
                 info.tp = sum.total_price;