From de8b94dd3af51afc70721d4129ccd4f451a5a3a4 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 21 Oct 2022 13:55:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=206028=20=E8=AF=B7=E5=81=87=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=86=85=E6=95=B0=E6=8D=AE=E5=92=8C=E6=A1=A3=E6=A1=88=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/.vscode/launch.json     | 16 ++++++++--------
 api/app/lib/utils/member.js |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json
index 8f28ea6..3a4a4a3 100644
--- a/api/.vscode/launch.json
+++ b/api/.vscode/launch.json
@@ -35,16 +35,16 @@
             "--clickHousePort 30123",
 
             // 开发
-            "--clickHouseUrl http://10.8.30.71",
-            "--clickHousePepEmis pepca_dev",
-            "--clickHouseCamworkflow camworkflow",
-            "--clickHouseHr hr_dev",
+            // "--clickHouseUrl http://10.8.30.71",
+            // "--clickHousePepEmis pepca_dev",
+            // "--clickHouseCamworkflow camworkflow",
+            // "--clickHouseHr hr_dev",
 
             // 测试
-            // "--clickHouseUrl http://10.8.30.161",
-            // "--clickHousePepEmis pepca8",
-            // "--clickHouseCamworkflow camworkflow",
-            // "--clickHouseHr hrm",
+            "--clickHouseUrl http://10.8.30.161",
+            "--clickHousePepEmis pepca8",
+            "--clickHouseCamworkflow camworkflow",
+            "--clickHouseHr hrm",
          ]
       },
       {
diff --git a/api/app/lib/utils/member.js b/api/app/lib/utils/member.js
index 4442dbb..28263d2 100644
--- a/api/app/lib/utils/member.js
+++ b/api/app/lib/utils/member.js
@@ -74,10 +74,10 @@ module.exports = function (app, opts) {
 
       let overtimeCountStatisticWhere = []
       if (overtimeCountStatisticStartDate) {
-         overtimeCountStatisticWhere.push(`overtime.start_time >= '${moment(overtimeCountStatisticStartDate).format('YYYY-MM-DD')}'`)
+         overtimeCountStatisticWhere.push(`overtime.start_time >= '${moment(overtimeCountStatisticStartDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`)
       }
       if (overtimeCountStatisticendDate) {
-         overtimeCountStatisticWhere.push(`overtime.end_time <= '${moment(overtimeCountStatisticendDate).format('YYYY-MM-DD')}'`)
+         overtimeCountStatisticWhere.push(`overtime.end_time <= '${moment(overtimeCountStatisticendDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'`)
       }
 
       let vacateDayStatisticWhere = []
@@ -155,7 +155,7 @@ module.exports = function (app, opts) {
             ) AS overtimeDayStatistic
                ON overtimeDayStatistic.pepUserId = member.pep_user_id`: ''}
             
-         ${overtimeCountStatistic? `
+         ${overtimeCountStatistic ? `
             LEFT JOIN (
                SELECT
                   overtime.pep_user_id AS pepUserId,