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,