fix 档案和信息请假时间不一

api/.vscode/launch.json

@@ -27,26 +27,24 @@
             "--qnbkt dev-hr",
             // "--qndmn http://resources.anxinyun.cn",
             "--qndmn http://rjkwed13l.hn-bkt.clouddn.com",
-            // click 开发
-            "--clickHouseUrl http://10.8.30.71",
-            // click 测试
-            // "--clickHouseUrl http://10.8.30.161",
-            // "--clickHouseUrl https://clickhouse01.anxinyun.cn/play",
-            "--clickHousePort 30123",
             
             // 似乎不能传空 先注释 * 2
             // "--clickHouseUser ",
             // "--clickHousePassword ",
 
+            "--clickHousePort 30123",
+
             // 开发
+            "--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 hr_dev",
+            // "--clickHouseHr hrm",
          ]
       },
       {

api/app/lib/controllers/member/index.js

@@ -397,13 +397,23 @@ async function vacateStatistics (ctx) {
 
       const timeOption = []
       if (startDate) {
+         // 按发起时间
+         // timeOption.push(
+         //    `wpStory.create_at >= '${moment(startDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
+         // )
+
+         // 按请假开始时间
          timeOption.push(
-            `wpStory.create_at > '${moment(startDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
+            `start_time >= '${moment(startDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
          )
       }
       if (endDate) {
+         // timeOption.push(
+         //    `wpStory.create_at <= '${moment(endDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
+         // )
+
          timeOption.push(
-            `wpStory.create_at <= '${moment(endDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
+            `start_time <= '${moment(endDate).endOf('day').format('YYYY-MM-DD HH:mm:ss')}'`
          )
       }
       const dataRes = await clickHouse.hr.query(`
@@ -419,8 +429,8 @@ async function vacateStatistics (ctx) {
             vacate
          INNER JOIN ${pepEmis}.workflow_process_history AS wpStory
             ON wpStory.id = vacate.pep_process_story_id
-            ${timeOption.length ? `AND ${timeOption.join(' AND ')}` : ''}
          WHERE vacate.pep_user_id = ${pepUserId}
+            ${timeOption.length ? `AND ${timeOption.join(' AND ')}` : ''}
       `).toPromise()
 
       const statisticRes = await clickHouse.hr.query(`