瀏覽代碼

checked-zone取期用值调整

MaiXinRong 2 年之前
父節點
當前提交
90a2cfca65
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      app/service/rpt_gather_memory.js

+ 5 - 4
app/service/rpt_gather_memory.js

@@ -325,10 +325,11 @@ module.exports = app => {
             for (const stage of stages) {
             for (const stage of stages) {
                 if (stage.status !== auditConst.stage.status.checked) continue;
                 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_day = sTime;
                 stage.checked_time = moment(finalAudit.end_time);
                 stage.checked_time = moment(finalAudit.end_time);
                 if (sTime.isBetween(beginTime, endTime, null, '[]')) {
                 if (sTime.isBetween(beginTime, endTime, null, '[]')) {