Merge remote-tracking branch 'origin/reg' into reg

attendance-performance-manager/pom.xml

@@ -157,7 +157,7 @@
 			<id>yanyuan</id>
 			<properties>
 				<profiles.active>yanyuan</profiles.active>
-				<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>
+				<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>

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

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponse;
 import com.aliyun.dingtalkworkflow_1_0.models.ListProcessInstanceIdsResponseBody;
@@ -218,6 +219,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
     }
 
     private void getLeaveRecordByUserList(AttendanceLeaveRecordQuery query, List<UserEntity> userEntityList, List<AttendanceLeaveRecordEntity> waitSyncLeaveRecords) {
+       log.info("获取用户记录: {}", JSON.toJSONString(userEntityList));
         for (UserEntity item : userEntityList) {
             String dingUserId = item.getDingUserId();
             long startTime = DateUtil.parseDateTime(query.getStartTimeStart() + " 00:00:00").getTime();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java

@@ -110,13 +110,14 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
             long between = DateUtil.between(DateUtil.parseDate(query.getStartTimeStart()), DateUtil.parseDate(query.getEndTimeEnd()), DateUnit.DAY, true);
             if (between > 120) throw new AppException("时间范围不能超过120天");
             Context context = this.getContext();
-            Thread thread = new Thread(new Runnable() {
+
+            Runnable runnable = new Runnable() {
                 @Override
                 public void run() {
                     service.syncLeaveRecord(query, context);
                 }
-            });
-            ThreadPool.getInstance().execute(thread);
+            };
+            ThreadPool.getInstance().execute(runnable);
 
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);

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

@@ -132,8 +132,9 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "startTimeStart": "2024-03-01",
-  "endTimeEnd": "2024-04-09"
+  "staffId": 405,
+  "startTimeStart": "2024-08-11",
+  "endTimeEnd": "2024-08-20"
 }