|
@@ -326,8 +326,7 @@ module.exports = app => {
|
|
|
const finalAudit = await this.ctx.service.stageAudit.getLastestAuditor(stage.id, stage.times, stage.status);
|
|
|
if (!finalAudit) continue;
|
|
|
|
|
|
- const sTime = moment(finalAudit.end_time);
|
|
|
- // console.log(stage.order, finalAudit.end_time);
|
|
|
+ const sTime = moment(moment(finalAudit.end_time).format('YYYY-MM-DD'), 'YYYY-MM-DD');
|
|
|
stage.checked_time = sTime;
|
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|
|
|
validStages.push(stage);
|
|
@@ -337,7 +336,6 @@ module.exports = app => {
|
|
|
if (!endStage || endStage.checked_time.isAfter(sTime)) endStage = stage;
|
|
|
}
|
|
|
}
|
|
|
- // console.log(validStages.map(x => { return x.order }), preStage ? preStage.order : -1, endStage ? endStage.order : -1);
|
|
|
return [validStages, preStage, endStage];
|
|
|
}
|
|
|
|