添加删除本地多余的部门部门

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java

@@ -104,7 +104,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
             boolean bool = review(req);
             if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
-            log.error(busiDesc, e);
+            log.error(busiDesc, e.getMessage());
             return Rest.fail(e.getMessage());
         }
         log.info("响应【{}】【响应体】--> {} ", busiDesc, JSONObject.toJSONString(rest));
@@ -129,7 +129,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
             boolean bool = complain(req);
             if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
-            log.error(busiDesc, e);
+            log.error(busiDesc, e.getMessage());
             return Rest.fail(e.getMessage());
         }
         log.info("响应【{}】【响应体】--> {} ", busiDesc, JSONObject.toJSONString(rest));
@@ -154,7 +154,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
             boolean bool = gowork(req);
             if (bool) throw new AppException(busiDesc + "失败！");
         } catch (Exception e) {
-            log.error(busiDesc, e);
+            log.error(busiDesc, e.getMessage());
             return Rest.fail(e.getMessage());
         }
         log.info("响应【{}】【响应体】--> {} ", busiDesc, JSONObject.toJSONString(rest));
@@ -184,7 +184,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
                 effect(req);
             }
         } catch (Exception e) {
-            log.error(busiDesc, e);
+            log.error(busiDesc, e.getMessage());
             return Rest.fail(e.getMessage());
         }
         log.info("响应【{}】【响应体】--> {} ", busiDesc, JSONObject.toJSONString(rest));

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

@@ -3,34 +3,33 @@ 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.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.busiz.h5.req.AttendSaveReq;
-import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo;
-import com.mortals.xhx.module.attendance.service.*;
+import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
+import com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService;
+import com.mortals.xhx.module.attendance.service.AttendanceRecordErrorService;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
-import com.mortals.xhx.module.check.model.CheckAttendRecordQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
-import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
 import org.springframework.util.ObjectUtils;
 
 import java.time.LocalDate;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -293,11 +293,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         if (isLeave) {
             //查看请假时间段，是否为跨天记录
             for (AttendanceLeaveRecordEntity leaveRecord : leaveRecords) {
-                long between = DateUtil.between(leaveRecord.getStartTime(), leaveRecord.getEndTime(), DateUnit.DAY);
+                long between = DateUtil.betweenDay(leaveRecord.getStartTime(), leaveRecord.getEndTime(), true);
                 if (between > 0) {
                     //跨天 判断当前日期是否在全天，没在 就
                     //判断日期是否在最后一天 不是的话 为全天
-                    long betweened = DateUtil.between(DateUtil.parseDate(commonData.getDateStr()), leaveRecord.getEndTime(), DateUnit.DAY);
+                    long betweened = DateUtil.betweenDay(DateUtil.parseDate(commonData.getDateStr()), leaveRecord.getEndTime(), true);
                     if (betweened > 0) {
                         //全天
                         calLeaveDate(commonData, DateUtil.parseDateTime(commonData.getDateStr() + " 00:00:00"), DateUtil.parseDateTime(commonData.getDateStr() + " 23:59:59"));

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

@@ -58,8 +58,9 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-11-18",
-  "attendanceDateEnd": "2024-11-26"
+  "attendanceDateStart": "2025-01-20",
+  "attendanceDateEnd": "2025-01-21",
+  "staffId":317
 }