fix 6028 请假统计列表筛选时间内数据和档案详情不一致

api/.vscode/launch.json

@@ -35,16 +35,16 @@
             "--clickHousePort 30123",
 
             // 开发
-            "--clickHouseUrl http://10.8.30.71",
+            // "--clickHouseUrl http://10.8.30.71",
-            "--clickHousePepEmis pepca_dev",
+            // "--clickHousePepEmis pepca_dev",
-            "--clickHouseCamworkflow camworkflow",
+            // "--clickHouseCamworkflow camworkflow",
-            "--clickHouseHr hr_dev",
+            // "--clickHouseHr hr_dev",
 
             // 测试
-            // "--clickHouseUrl http://10.8.30.161",
+            "--clickHouseUrl http://10.8.30.161",
-            // "--clickHousePepEmis pepca8",
+            "--clickHousePepEmis pepca8",
-            // "--clickHouseCamworkflow camworkflow",
+            "--clickHouseCamworkflow camworkflow",
-            // "--clickHouseHr hrm",
+            "--clickHouseHr hrm",
          ]
       },
       {

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,