Browse Source

(*)v3.9.0 加班统计导出:合计加班时长(小时) 计算有误调整

master
周沫沫历险记 2 years ago
parent
commit
a9d8b090b6
  1. 12
      api/app/lib/controllers/attendance/index.js

12
api/app/lib/controllers/attendance/index.js

@ -2,7 +2,7 @@
const moment = require('moment') const moment = require('moment')
const fs = require('fs'); const fs = require('fs');
async function overtimeStatistic (ctx) { async function overtimeStatistic(ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
@ -47,7 +47,7 @@ async function overtimeStatistic (ctx) {
} }
} }
async function exportOvertimeStatistic (ctx) { async function exportOvertimeStatistic(ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
@ -92,7 +92,7 @@ async function exportOvertimeStatistic (ctx) {
d['sum' + overtimeTypeKey] = overtimeStatistic.reduce((sum, o) => { d['sum' + overtimeTypeKey] = overtimeStatistic.reduce((sum, o) => {
if (o.compensate == overtimeTypeKey) { if (o.compensate == overtimeTypeKey) {
sum += o.duration / 3600 sum += o.duration / 3600
totalDuration += o.duration / 3600 // totalDuration += o.duration / 3600
} }
return sum return sum
}, 0) }, 0)
@ -158,7 +158,7 @@ async function exportOvertimeStatistic (ctx) {
} }
} }
async function vacateType (ctx) { async function vacateType(ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
@ -178,7 +178,7 @@ async function vacateType (ctx) {
} }
} }
async function vacateStatistic (ctx) { async function vacateStatistic(ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs
@ -224,7 +224,7 @@ async function vacateStatistic (ctx) {
} }
} }
async function exportVacateStatistic (ctx) { async function exportVacateStatistic(ctx) {
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs const { clickHouse } = ctx.app.fs

Loading…
Cancel
Save