Commit 1c65e75f authored by 赵啸非's avatar 赵啸非

修改考勤汇总查询

parent ae529035
...@@ -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;
...@@ -206,6 +207,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -206,6 +207,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords); getLeaveRecordByUserList(query, userEntityList, waitSyncLeaveRecords);
} }
log.info("待同步请假记录:{}", JSON.toJSONString(waitSyncLeaveRecords));
if (!ObjectUtils.isEmpty(waitSyncLeaveRecords)) { if (!ObjectUtils.isEmpty(waitSyncLeaveRecords)) {
for (AttendanceLeaveRecordEntity waitSyncLeaveRecord : waitSyncLeaveRecords) { for (AttendanceLeaveRecordEntity waitSyncLeaveRecord : waitSyncLeaveRecords) {
dingPersonService.handleByProcessInstanceId(waitSyncLeaveRecord.getRemark()); dingPersonService.handleByProcessInstanceId(waitSyncLeaveRecord.getRemark());
......
...@@ -110,13 +110,15 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont ...@@ -110,13 +110,15 @@ 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);
......
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