|
@@ -124,11 +124,11 @@ module.exports = app => {
|
|
|
const isLastage = await ctx.service.stage.isLastStage(audit.tid, audit.id);
|
|
|
if (isLastage) await this.ctx.service.stage.checkStageGatherData(audit);
|
|
|
}
|
|
|
- audit.gather_tp = ctx.helper.add(audit.contract_tp, audit.qc_tp);
|
|
|
- audit.end_contract_tp = ctx.helper.add(audit.contract_tp, audit.pre_contract_tp);
|
|
|
- audit.end_qc_tp = ctx.helper.add(audit.qc_tp, audit.pre_qc_tp);
|
|
|
- audit.end_gather_tp = ctx.helper.add(audit.end_contract_tp, audit.end_qc_tp);
|
|
|
+ audit.gather_tp = ctx.helper.sum([audit.contract_tp, audit.qc_tp, audit.pc_tp]);
|
|
|
+ // audit.end_contract_tp = ctx.helper.add(audit.contract_tp, audit.pre_contract_tp);
|
|
|
+ // audit.end_qc_tp = ctx.helper.add(audit.qc_tp, audit.pre_qc_tp);
|
|
|
audit.pre_gather_tp = ctx.helper.add(audit.pre_contract_tp, audit.pre_qc_tp);
|
|
|
+ audit.end_gather_tp = ctx.helper.add(audit.gather_tp, audit.pre_gather_tp);
|
|
|
}
|
|
|
// 获取待审批的变更期
|
|
|
const auditChanges = await ctx.service.changeAudit.getAuditChangeByWap(ctx.session.sessionUser.accountId);
|