From 59a6517bb21c41d3ef073e1b2d75e4f85c93aeba Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 23 May 2024 11:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AD=90=E8=A1=A8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupshiftitem/AttendanceGroupShiftItemController.java   | 2 +-
 .../controller/app/attendance/AttendanceController.java      | 2 +-
 .../system/service/attendance/AttendanceServiceImpl.java     | 5 +++--
 .../src/main/resources/logback-spring.xml                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/groupshiftitem/AttendanceGroupShiftItemController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/groupshiftitem/AttendanceGroupShiftItemController.java
index ec345be6..6e3c7a0c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/groupshiftitem/AttendanceGroupShiftItemController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/groupshiftitem/AttendanceGroupShiftItemController.java
@@ -29,7 +29,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
 
 @Tag(name = "管理后台 - 考勤组班次子表")
 @RestController
-@RequestMapping("/system.attendance/attendance-group-shift-item")
+@RequestMapping("/system/attendance/attendance-group-shift-item")
 @Validated
 public class AttendanceGroupShiftItemController {
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java
index d7d015b1..02d09cb5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java
@@ -29,7 +29,7 @@ public class AttendanceController {
     @GetMapping("/getPunchPage")
     @Operation(summary = "获取考勤页面")
     public CommonResult<AttendancePunchPageVO> getPunchPage(@ModelAttribute AttendancePunchPageDTO dto) {
-        AttendancePunchPageVO vo = attendanceService.getPunchPage(dto.setUserId(getLoginUserId()));
+        AttendancePunchPageVO vo = attendanceService.getPunchPage(dto);
         return success(vo);
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
index c5822d56..b567c492 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
@@ -136,8 +136,9 @@ public class AttendanceServiceImpl implements AttendanceService {
                 .setDayTime(pageVO.getTargetDayStr())
                 .setShouldPunchTime(pageVO.getShouldPunchTime())
                 .setPunchTime(dto.getLocalDateTime())
-                .setLateTime(Constants.ONE.equals(status) ? LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS) : 0L)
-                .setLeaveEarlyTime(Constants.TWO.equals(status) ? LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS) : 0L)
+                //取绝对值 如果status是负数则变为正数
+                .setLateTime(Constants.ONE.equals(status) ? Math.abs(LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS)) : 0L)
+                .setLeaveEarlyTime(Constants.TWO.equals(status) ? Math.abs(LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS)) : 0L)
                 .setRemark(dto.getRemark())
                 .setImage(dto.getImage())
                 .setPunchAddress(dto.getPunchAddress());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml
index b62890e3..50f31a01 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml
@@ -66,7 +66,7 @@
     </springProfile>
     <!-- 其它环境 -->
     <springProfile name="dev,test,stage,prod,default">
-        <root level="DEBUG">
+        <root level="INFO">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="ASYNC"/>
             <appender-ref ref="GRPC"/>