|
|
@@ -327,11 +327,11 @@ module.exports = app => {
|
|
|
|
|
|
// 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) : '';
|
|
|
+ const sTime = moment(stage.period ? (stage.period.split(' ~ ')[1] ? stage.period.split(' ~ ')[1] : stage.period) : '', 'YYYY-MM-DD');
|
|
|
stage.checked_day = sTime;
|
|
|
- stage.checked_time = moment(finalAudit.end_time);
|
|
|
+ stage.checked_time = moment(sTime);
|
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|
|
|
validStages.push(stage);
|
|
|
} else if (sTime.isBefore(beginTime)) {
|
