Просмотр исходного кода

成本分析,新建期,明细数据,乙方取值问题

MaiXinRong 3 месяцев назад
Родитель
Сommit
0aec7cc816
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      app/service/cost_stage_book_detail.js
  2. 2 2
      app/service/cost_stage_detail.js

+ 2 - 2
app/service/cost_stage_book_detail.js

@@ -81,8 +81,8 @@ module.exports = app => {
             //     '    WHERE cs.tid = ? AND cs.stage_order <= ? AND sd.is_deal = 1' +
             //     '    WHERE cs.tid = ? AND cs.stage_order <= ? AND sd.is_deal = 1' +
             //     '  ) t WHERE t.rn = 1';
             //     '  ) t WHERE t.rn = 1';
             const dealDetailSql =
             const dealDetailSql =
-                'SELECT a.code, a.name, a.tax, a.is_deaL, b.* FROM (' +
-                '  SELECT sd.cost_id, sd.code, sd.name, sd.tax, sd.is_deal, sd.source_cid' +
+                'SELECT a.code, a.name, a.tax, a.is_deaL, a.party_b, b.* FROM (' +
+                '  SELECT sd.cost_id, sd.code, sd.name, sd.party_b, sd.tax, sd.is_deal, sd.source_cid' +
                 '    FROM (' +
                 '    FROM (' +
                 '      SELECT cost_id, source_cid, max(add_time) AS latest_time FROM zh_cost_stage_detail WHERE tender_id = ? AND stage_order <= ? AND is_deal = 1 GROUP BY cost_id, source_cid' +
                 '      SELECT cost_id, source_cid, max(add_time) AS latest_time FROM zh_cost_stage_detail WHERE tender_id = ? AND stage_order <= ? AND is_deal = 1 GROUP BY cost_id, source_cid' +
                 '    ) lastTable LEFT JOIN zh_cost_stage_detail sd ON lastTable.latest_time = sd.add_time AND sd.cost_id = lastTable.cost_id AND sd.source_cid = lastTable.source_cid' +
                 '    ) lastTable LEFT JOIN zh_cost_stage_detail sd ON lastTable.latest_time = sd.add_time AND sd.cost_id = lastTable.cost_id AND sd.source_cid = lastTable.source_cid' +

+ 2 - 2
app/service/cost_stage_detail.js

@@ -77,8 +77,8 @@ module.exports = app => {
             //     '    WHERE cs.tid = ? AND cs.stage_order <= ? AND sd.is_deal = 1' +
             //     '    WHERE cs.tid = ? AND cs.stage_order <= ? AND sd.is_deal = 1' +
             //     '  ) t WHERE t.rn = 1';
             //     '  ) t WHERE t.rn = 1';
             const dealDetailSql =
             const dealDetailSql =
-                'SELECT a.code, a.name, a.tax, b.* FROM (' +
-                '  SELECT sd.cost_id, sd.code, sd.name, sd.tax, sd.source_cid' +
+                'SELECT a.code, a.name, a.tax, a.party_b, b.* FROM (' +
+                '  SELECT sd.cost_id, sd.code, sd.name, sd.party_b, sd.tax, sd.source_cid' +
                 '    FROM (' +
                 '    FROM (' +
                 '      SELECT source_cid, max(add_time) AS latest_time FROM zh_cost_stage_detail WHERE tender_id = ? AND stage_order <= ? AND is_deal = 1 GROUP BY cost_id, source_cid' +
                 '      SELECT source_cid, max(add_time) AS latest_time FROM zh_cost_stage_detail WHERE tender_id = ? AND stage_order <= ? AND is_deal = 1 GROUP BY cost_id, source_cid' +
                 '    ) lastTable LEFT JOIN zh_cost_stage_detail sd ON lastTable.latest_time = sd.add_time AND sd.cost_id = lastTable.cost_id AND sd.source_cid = lastTable.source_cid' +
                 '    ) lastTable LEFT JOIN zh_cost_stage_detail sd ON lastTable.latest_time = sd.add_time AND sd.cost_id = lastTable.cost_id AND sd.source_cid = lastTable.source_cid' +