添加用户钉钉主动拉取请假记录

attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/AddAttendThread.java

@@ -53,16 +53,16 @@ public class AddAttendThread implements Runnable {
             Long compare = DateUtil.between(attendEnd, attendStart, DateUnit.DAY);
             StopWatch stopWatch = new StopWatch("stopwatch attend");
             log.info("考勤计算天数区间：{}", compare);
+            stopWatch.start("执行本地方法");
             for (int i = 0; i <= compare.intValue(); i++) {
                 DateTime curDate = DateUtil.offsetDay(attendStart, i);
-                log.info("考勤计算日期：{}", curDate.toDateStr());
-                stopWatch.start("执行本地方法");
+                //log.info("考勤计算日期：{}", curDate.toDateStr());
                 hikEntity.setAttendanceDateStart(curDate.toDateStr());
                 hikEntity.setAttendanceDateEnd(curDate.toDateStr());
                 hikService.addAttendanceRecordByQuery(hikEntity, context);
-                stopWatch.stop();
-                log.info("考勤计算日期：{} 完成,耗时：{}ms", curDate.toDateStr(), stopWatch.getLastTaskTimeMillis());
             }
+            stopWatch.stop();
+            log.info("完成,耗时：{}ms", stopWatch.getLastTaskTimeMillis());
             //生成汇总信息
             log.info("生成考勤汇总消息开始。。。");
             AttendanceSummaryQuery query = new AttendanceSummaryQuery();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java

@@ -127,7 +127,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
             AttendanceRecordHikQuery attendanceRecordHikQuery = new AttendanceRecordHikQuery();
             attendanceRecordHikQuery.setStaffId(entity.getLeavePersonId());
             //判断请假的开始日期与结束日期
-            boolean in = DateUtil.isIn(new Date(), entity.getEndTime(), new Date());
+            boolean in = DateUtil.isIn(new Date(), entity.getStartTime(),entity.getEndTime());
             if (in) {
                 //当前日期在请假期间，计算考勤结束时间为当前时间;
                 attendanceRecordHikQuery.setAttendanceDateStart(DateUtil.formatDate(entity.getStartTime()));

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -110,7 +110,7 @@ Content-Type: application/json
 
 {
   "startTimeStart":"2023-11-01",
-  "endTimeEnd":"2023-11-01"
+  "endTimeEnd":"2023-11-10"
 }