From 4e9f2f18aa6d4e4efe11645e251b713869fa9746 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 二月 2026 14:08:59 +0800
Subject: [PATCH] fix: 修改来票登记时计算来票登记表的总金额错误
---
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index 8b2a7d2..1d35848 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -33,6 +33,7 @@
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -98,7 +99,7 @@
throw new BaseException(String.format("鎵撳崱澶辫触锛氭偍褰撳墠浣嶇疆璺濈鑰冨嫟鐐�%.2f绫筹紝瓒呭嚭鍏佽鑼冨洿锛�%s绫筹級", actualDistance, allowedRadius));
}
/*鍒ゆ柇鎵撳崱鏃堕棿*/
- LocalDateTime endAt = locationConfig.getEndAt(); //涓嬬彮鏃堕棿
+ LocalTime endAt = locationConfig.getEndAt(); //涓嬬彮鏃堕棿
// 鑾峰彇鑰冨嫟涓嬬彮鏃堕棿鐐�
int standardHour = endAt.getHour();
int standardMinute = endAt.getMinute();
@@ -153,9 +154,9 @@
LocalDateTime actualTime = isStart ? attendanceRecord.getWorkStartAt() : attendanceRecord.getWorkEndAt();
try {
// 鑾峰彇鑰冨嫟鏃堕棿閰嶇疆
- LocalDateTime startAt = locationConfig.getStartAt();//涓婄彮鏃堕棿
- LocalDateTime endAt = locationConfig.getEndAt();//涓嬬彮鏃堕棿
- LocalDateTime timeConfig = isStart ? startAt : endAt;
+ LocalTime startAt = locationConfig.getStartAt();//涓婄彮鏃堕棿
+ LocalTime endAt = locationConfig.getEndAt();//涓嬬彮鏃堕棿
+ LocalTime timeConfig = isStart ? startAt : endAt;
// 瑙ｆ瀽灏忔椂鍜屽垎閽�
int standardHour = timeConfig.getHour();
int standardMinute = timeConfig.getMinute();
@@ -175,6 +176,8 @@
return 3; // 杩熷埌鏃╅��
}
return 2; // 鏃╅��
+ }else if (attendanceRecord.getStatus() == 1) {
+ return 1; // 涓嬬彮鎵撳崱姝ｅ父浣嗘槸涓婄彮杩熷埌
}
}
return 0; // 姝ｅ父
@@ -212,7 +215,7 @@
StaffOnJob staffOnJob = staffOnJobMapper.selectOne(staffQueryWrapper);
if (staffOnJob == null) {
- return null; // 褰撳墠鐢ㄦ埛娌℃湁瀵瑰簲鐨勫憳宸ヤ俊鎭�
+ throw new BaseException("褰撳墠鐢ㄦ埛娌℃湁瀵瑰簲鐨勫憳宸ヤ俊鎭�");
}
// 鏍规嵁鍛樺伐ID鍜屽綋鍓嶆棩鏈熸煡璇㈡墦鍗¤褰�
--
Gitblit v1.9.3