|
@@ -721,12 +721,12 @@ module.exports = app => {
|
|
|
|
|
|
async getStageByDataCollect(tenderId) {
|
|
|
const stages = await this.db.select(this.tableName, {
|
|
|
- columns: ['s_time', 'contract_tp', 'qc_tp', 'pre_contract_tp', 'pre_qc_tp'],
|
|
|
+ columns: ['s_time', 'contract_tp', 'qc_tp', 'pc_tp', 'pre_contract_tp', 'pre_qc_tp'],
|
|
|
where: { tid: tenderId },
|
|
|
orders: [['order', 'desc']],
|
|
|
});
|
|
|
for (const s of stages) {
|
|
|
- s.tp = this.ctx.helper.add(s.contract_tp, s.qc_tp);
|
|
|
+ s.tp = this.ctx.helper.sum([s.contract_tp, s.qc_tp, s.pc_tp]);
|
|
|
s.pre_tp = this.ctx.helper.add(s.pre_contract_tp, s.pre_qc_tp);
|
|
|
s.end_tp = this.ctx.helper.add(s.pre_tp, s.tp);
|
|
|
}
|