Commit 36b2b609 authored by 赵啸非's avatar 赵啸非

修改考勤汇总查询

parent 54d562ae
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponse; import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponse;
import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponseBody; import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponseBody;
...@@ -218,6 +219,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -218,6 +219,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
private void getLeaveRecordByUserList(AttendanceLeaveRecordQuery query, List<UserEntity> userEntityList, List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords) { private void getLeaveRecordByUserList(AttendanceLeaveRecordQuery query, List<UserEntity> userEntityList, List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords) {
log.info("获取用户记录: {}", JSON.toJSONString(userEntityList));
for (UserEntity item : userEntityList) { for (UserEntity item : userEntityList) {
String dingUserId = item.getDingUserId(); String dingUserId = item.getDingUserId();
long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime(); long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime();
......
...@@ -110,13 +110,14 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont ...@@ -110,13 +110,14 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
long between = DateUtil.between(DateUtil.parseDate(query.getStartTimeStart()), DateUtil.parseDate(query.getEndTimeEnd()), DateUnit.DAY, true); long between = DateUtil.between(DateUtil.parseDate(query.getStartTimeStart()), DateUtil.parseDate(query.getEndTimeEnd()), DateUnit.DAY, true);
if (between > 120) throw new AppException("时间范围不能超过120天"); if (between > 120) throw new AppException("时间范围不能超过120天");
Context context = this.getContext(); Context context = this.getContext();
Thread thread = new Thread(new Runnable() {
Runnable runnable = new Runnable() {
@Override @Override
public void run() { public void run() {
service.syncLeaveRecord(query, context); service.syncLeaveRecord(query, context);
} }
}); };
ThreadPool.getInstance().execute(thread); ThreadPool.getInstance().execute(runnable);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
......
...@@ -132,8 +132,9 @@ Authorization: {{authToken}} ...@@ -132,8 +132,9 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"startTimeStart": "2024-03-01", "staffId": 405,
"endTimeEnd": "2024-04-09" "startTimeStart": "2024-08-11",
"endTimeEnd": "2024-08-20"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment