|
@@ -325,10 +325,11 @@ module.exports = app => {
|
|
|
for (const stage of stages) {
|
|
|
if (stage.status !== auditConst.stage.status.checked) continue;
|
|
|
|
|
|
- const finalAudit = await this.ctx.service.stageAudit.getLastestAuditor(stage.id, stage.times, stage.status);
|
|
|
- if (!finalAudit) continue;
|
|
|
-
|
|
|
- const sTime = moment(moment(finalAudit.end_time).format('YYYY-MM-DD'), 'YYYY-MM-DD');
|
|
|
+ // const finalAudit = await this.ctx.service.stageAudit.getLastestAuditor(stage.id, stage.times, stage.status);
|
|
|
+ // if (!finalAudit) continue;
|
|
|
+ //
|
|
|
+ // const sTime = moment(moment(finalAudit.end_time).format('YYYY-MM-DD'), 'YYYY-MM-DD');
|
|
|
+ const sTime = stage.period ? (stage.period.split(' ~ ')[1] ? stage.period.split(' ~ ')[1] : s.period) : '';
|
|
|
stage.checked_day = sTime;
|
|
|
stage.checked_time = moment(finalAudit.end_time);
|
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|