From a9d8b090b6bf94c5aa7387b3e200d9058c857149 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Mon, 27 Feb 2023 16:54:46 +0800 Subject: [PATCH] =?UTF-8?q?(*)v3.9.0=20=E5=8A=A0=E7=8F=AD=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=AF=BC=E5=87=BA=EF=BC=9A=E5=90=88=E8=AE=A1=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E6=97=B6=E9=95=BF(=E5=B0=8F=E6=97=B6)=20=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=9C=89=E8=AF=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/attendance/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/app/lib/controllers/attendance/index.js b/api/app/lib/controllers/attendance/index.js index c01ca40..96eb2cb 100644 --- a/api/app/lib/controllers/attendance/index.js +++ b/api/app/lib/controllers/attendance/index.js @@ -2,7 +2,7 @@ const moment = require('moment') const fs = require('fs'); -async function overtimeStatistic (ctx) { +async function overtimeStatistic(ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs @@ -47,7 +47,7 @@ async function overtimeStatistic (ctx) { } } -async function exportOvertimeStatistic (ctx) { +async function exportOvertimeStatistic(ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs @@ -92,7 +92,7 @@ async function exportOvertimeStatistic (ctx) { d['sum' + overtimeTypeKey] = overtimeStatistic.reduce((sum, o) => { if (o.compensate == overtimeTypeKey) { sum += o.duration / 3600 - totalDuration += o.duration / 3600 + // totalDuration += o.duration / 3600 } return sum }, 0) @@ -158,7 +158,7 @@ async function exportOvertimeStatistic (ctx) { } } -async function vacateType (ctx) { +async function vacateType(ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs @@ -178,7 +178,7 @@ async function vacateType (ctx) { } } -async function vacateStatistic (ctx) { +async function vacateStatistic(ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs @@ -224,7 +224,7 @@ async function vacateStatistic (ctx) { } } -async function exportVacateStatistic (ctx) { +async function exportVacateStatistic(ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs