|
@@ -327,13 +327,14 @@ module.exports = app => {
|
|
|
if (!finalAudit) continue;
|
|
|
|
|
|
const sTime = moment(moment(finalAudit.end_time).format('YYYY-MM-DD'), 'YYYY-MM-DD');
|
|
|
- stage.checked_time = sTime;
|
|
|
+ stage.checked_day = sTime;
|
|
|
+ stage.checked_time = moment(finalAudit.end_time);
|
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|
|
|
validStages.push(stage);
|
|
|
} else if (sTime.isBefore(beginTime)) {
|
|
|
- if (!preStage || preStage.checked_time.isBefore(sTime)) preStage = stage;
|
|
|
+ if (!preStage || preStage.checked_time.isBefore(stage.checked_time)) preStage = stage;
|
|
|
} else if (sTime.isAfter(endTime)) {
|
|
|
- if (!endStage || endStage.checked_time.isAfter(sTime)) endStage = stage;
|
|
|
+ if (!endStage || endStage.checked_time.isAfter(stage.checked_time)) endStage = stage;
|
|
|
}
|
|
|
}
|
|
|
return [validStages, preStage, endStage];
|