From 5accd55a391be647f6e313d950cedc4af35f9dcc Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Tue, 18 Oct 2022 09:28:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/schedule/attendance.js | 1 + api/config.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/app/lib/schedule/attendance.js b/api/app/lib/schedule/attendance.js index b2ad736..f83023c 100644 --- a/api/app/lib/schedule/attendance.js +++ b/api/app/lib/schedule/attendance.js @@ -317,6 +317,7 @@ module.exports = function (app, opts) { let packageSuccess = true // 考虑加了好多天的流程 let curday = begainTime_.clone() + let packageDay = [] while (curday.isSameOrBefore(endTimeWithHrAffirm)) { let duration_ = 0 if (curday.isSame(endTimeWithHrAffirm, 'day')) { diff --git a/api/config.js b/api/config.js index 8956cf9..b944e8a 100644 --- a/api/config.js +++ b/api/config.js @@ -33,7 +33,7 @@ args.option('clickHouseHr', 'clickHouse 人资数据库名称'); const flags = args.parse(process.argv); -const POMS_DB = process.env.POMS_DB || flags.pg; +const HR_DB = process.env.HR_DB || flags.pg; const LOCAL_SVR_ORIGIN = process.env.LOCAL_SVR_ORIGIN || flags.fileHost; // Redis 参数 @@ -63,7 +63,7 @@ const CLICKHOUST_HR = process.env.CLICKHOUST_HR || flags.clickHouseHr const API_TIMOR_URL = 'http://timor.tech/api/' if ( - !POMS_DB + !HR_DB || !IOTA_REDIS_SERVER_HOST || !IOTA_REDIS_SERVER_PORT || !API_EMIS_URL || !QINIU_DOMAIN_QNDMN_RESOURCE || !QINIU_BUCKET_RESOURCE || !QINIU_AK || !QINIU_SK @@ -162,7 +162,7 @@ const product = { } ], dc: { - url: POMS_DB, + url: HR_DB, opts: { pool: { max: 80,