|
|
@@ -331,21 +331,21 @@ module.exports = app => {
|
|
|
const finalAudit = await this.ctx.service.stageAudit.getLastestAuditor(stage.id, stage.times, stage.status);
|
|
|
if (!finalAudit) continue;
|
|
|
|
|
|
- sTime = moment(moment(finalAudit.end_time).format('YYYY-MM-DD'), 'YYYY-MM-DD');
|
|
|
+ sTime = moment(finalAudit.end_time).format('YYYY-MM-DD');
|
|
|
break;
|
|
|
case 'period-end':
|
|
|
- sTime = moment(stage.period ? (stage.period.split(' ~ ')[1] ? stage.period.split(' ~ ')[1] : stage.period) : '', 'YYYY-MM-DD');
|
|
|
+ sTime = stage.period ? (stage.period.split(' ~ ')[1] ? stage.period.split(' ~ ')[1] : stage.period) : '';
|
|
|
break;
|
|
|
default:
|
|
|
throw '配置参数错误';
|
|
|
}
|
|
|
stage.checked_day = sTime;
|
|
|
- stage.checked_time = moment(sTime);
|
|
|
- if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|
|
|
+ stage.checked_time = moment(sTime, 'YYYY-MM-DD');
|
|
|
+ if (stage.checked_time.isBetween(beginTime, endTime, null, '[]')) {
|
|
|
validStages.push(stage);
|
|
|
- } else if (sTime.isBefore(beginTime)) {
|
|
|
+ } else if (stage.checked_time.isBefore(beginTime)) {
|
|
|
if (!preStage || preStage.checked_time.isBefore(stage.checked_time)) preStage = stage;
|
|
|
- } else if (sTime.isAfter(endTime)) {
|
|
|
+ } else if (stage.checked_time.isAfter(endTime)) {
|
|
|
if (!endStage || endStage.checked_time.isAfter(stage.checked_time)) endStage = stage;
|
|
|
}
|
|
|
}
|
|
|
@@ -711,7 +711,7 @@ module.exports = app => {
|
|
|
await this._gatherIndexZoneData(tender, completeData, gsCustom.stage_zone);
|
|
|
break;
|
|
|
case 'custom-zone':
|
|
|
- await this._gatherCustomZoneData(tender, completeData, gsCustom.custom_zone);
|
|
|
+ await this._gatherCustomZoneData(tender, completeData, gsCustom.custom_zone, gsSetting.timeType);
|
|
|
break;
|
|
|
}
|
|
|
commonIndex++;
|
|
|
@@ -1391,7 +1391,6 @@ module.exports = app => {
|
|
|
this.resultStageBonus = [];
|
|
|
const gsSetting = JSON.parse(gsDefine.setting);
|
|
|
for (const tender of gsCustom.tenders) {
|
|
|
- console.log(tender, gsSetting.type);
|
|
|
switch (gsSetting.type) {
|
|
|
case 'month':
|
|
|
await this._gatherMonthStageBonus(tender, gsCustom.month);
|
