From 7d28cb895f28f9000e7d7158a730ca2a3571c0c7 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Sat, 25 Apr 2026 10:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IRzAttendanceService.java         |  2 +-
 .../service/impl/RzAttendanceServiceImpl.java | 20 ++++++++++---------
 ...ceChangeRechargeCardExchangeProcessor.java |  2 +-
 .../src/main/resources/application-local.yml  |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java b/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java
index e6741ed..3b5f303 100644
--- a/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java
+++ b/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java
@@ -67,7 +67,7 @@ public interface IRzAttendanceService extends IService<RzAttendance>
 
     public void dingDing(String dingUserId, String bizId, Long checkTime);
 
-    void addRzOverTime(String result, SysStaff sysStaff, DingShiftGroup dingsShiftGroup,  String checkType, Date formatWorkDate, Date formatUserCheckTime, String timeResult, String remark, Double debiting);
+    void addRzOverTime(String result, SysStaff sysStaff, DingShiftGroup dingsShiftGroup,  String checkType, Date formatWorkDate, Date formatUserCheckTime, String timeResult, String remark, Double debiting, RzAttendance attendance);
 
     public RzAttendance queryNowDayAttendanceByStatisticalIdAndDate(Long staffId, Date date);
 
diff --git a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java
index 1437fd1..e096cac 100644
--- a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java
+++ b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java
@@ -534,7 +534,7 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
                     for (int i = 0; i < jsonArray.size(); i++) {
                         JSONObject ob =  jsonArray.getJSONObject(i);
                         if(bizId.equals(ob.getString("bizId"))){
-                            calculationAddRzOverTime(result, sysStaff, ob);
+                            calculationAddRzOverTime(result, sysStaff, ob, null);
 //                            //打卡类型
 //                            String checkType = ob.getString("checkType");
 //                            //考勤组
@@ -574,13 +574,15 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
     }
 
     @Override
-    public void addRzOverTime(String result, SysStaff sysStaff, DingShiftGroup dingsShiftGroup, String checkType, Date formatWorkDate, Date formatUserCheckTime, String timeResult, String remark, Double debiting){
+    public void addRzOverTime(String result, SysStaff sysStaff, DingShiftGroup dingsShiftGroup, String checkType, Date formatWorkDate, Date formatUserCheckTime, String timeResult, String remark, Double debiting,RzAttendance attendance){
         if(dingsShiftGroup != null){
             //通过打卡类型, classId, 和排班打卡时间, 获取工作时长
             //通过班次id拿到工作时长
             DingShift dingsShift = dingsShiftMapper.selectByDingId(dingsShiftGroup.getShiftId());
             //通过workDate  获取哪一天的卡
-            RzAttendance attendance = queryNowDayAttendanceByStatisticalIdAndDate(sysStaff.getUserId(),formatWorkDate);
+            if(attendance == null){
+                attendance = queryNowDayAttendanceByStatisticalIdAndDate(sysStaff.getUserId(),formatWorkDate);
+            }
             //生成打卡记录
             rzAttendanceDetailService.addDetail(attendance, ("OnDuty".equals(checkType) ? "上班卡" : "下班卡"), "/", formatUserCheckTime, StringUtils.isEmpty(remark) ? "钉钉打卡" : remark, "");
             //上班
@@ -592,13 +594,13 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
                 }
             }else if("OffDuty".equals(checkType)){
                 attendance.setWorkEndTime(formatUserCheckTime);
-                if("Normal".equals(timeResult) && !"1".equals(attendance.getYcsFlag())){
+                if("Normal".equals(timeResult) && !"1".equals(attendance.getYcsFlag()) && attendance.getWorkStartTime() != null){
                     attendance.setWorkSum(BigDecimal.valueOf(dingsShift.getWorkHour()));
                 }else{
                     //早退需要计算工时
                     if(attendance.getWorkStartTime() != null){
                         Long hours = (attendance.getWorkEndTime().getTime() - attendance.getWorkStartTime().getTime())/1000/60/60;
-                        attendance.setWorkSum(BigDecimal.valueOf(hours));
+                        attendance.setWorkSum((BigDecimal.valueOf(dingsShift.getWorkHour()).compareTo(BigDecimal.valueOf(hours)) < 0) ? BigDecimal.valueOf(dingsShift.getWorkHour()) : BigDecimal.valueOf(hours));
                     }else {
                         attendance.setWorkSum(DataUtils.DEFAULT_VALUE);
                     }
@@ -650,11 +652,11 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
                         JSONArray jsonArray = resultJson.getJSONArray("recordresult");
                     JSONObject onDutyObject = (JSONObject) jsonArray.stream().filter(data -> "OnDuty".equals(((JSONObject)data).getString("checkType"))).findFirst().orElse(null);
                     if(onDutyObject != null){
-                        calculationAddRzOverTime(result, sysStaff, onDutyObject);
+                        calculationAddRzOverTime(result, sysStaff, onDutyObject, attendance);
                     }
                     JSONObject offDutyObject = (JSONObject) jsonArray.stream().filter(data -> "OffDuty".equals(((JSONObject)data).getString("checkType"))).findFirst().orElse(null);
                     if(offDutyObject != null){
-                        calculationAddRzOverTime(result, sysStaff, offDutyObject);
+                        calculationAddRzOverTime(result, sysStaff, offDutyObject, attendance);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -664,7 +666,7 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
         return attendance;
     }
 
-    public void calculationAddRzOverTime(String result ,SysStaff sysStaff, JSONObject ob){
+    public void calculationAddRzOverTime(String result ,SysStaff sysStaff, JSONObject ob, RzAttendance attendance){
         //打卡类型
         String checkType = ob.getString("checkType");
         //考勤组
@@ -693,7 +695,7 @@ public class RzAttendanceServiceImpl extends ServiceImpl<RzAttendanceMapper, RzA
         Date formatWorkDate = Date.from(Instant.ofEpochMilli(workDate));
         Date formatUserCheckTime = Date.from(Instant.ofEpochMilli(userCheckTime));
         DingShiftGroup dingsShiftGroup = dingsShiftGroupMapper.selectByGroupIdAndTypeAndCheckTime(groupId, shiftId, checkType, formatPlanCheckTime);
-        addRzOverTime(result, sysStaff, dingsShiftGroup, checkType, formatWorkDate, formatUserCheckTime, timeResult, null, 0d);
+        addRzOverTime(result, sysStaff, dingsShiftGroup, checkType, formatWorkDate, formatUserCheckTime, timeResult, null, 0d, attendance);
     }
 
     @Async
diff --git a/evo-admin/src/main/java/com/evo/ding/processor/instance/impl/InstanceChangeRechargeCardExchangeProcessor.java b/evo-admin/src/main/java/com/evo/ding/processor/instance/impl/InstanceChangeRechargeCardExchangeProcessor.java
index 03f76f3..4d8c36c 100644
--- a/evo-admin/src/main/java/com/evo/ding/processor/instance/impl/InstanceChangeRechargeCardExchangeProcessor.java
+++ b/evo-admin/src/main/java/com/evo/ding/processor/instance/impl/InstanceChangeRechargeCardExchangeProcessor.java
@@ -63,7 +63,7 @@ public class InstanceChangeRechargeCardExchangeProcessor implements InstanceChan
                         dingsShiftGroup = getDingShiftGroupService().selectByGroupIdAndTypeAndCheckTime(planResultObject.getString("group_id"), planResultObject.getString("class_id"), checkType, formatPlanCheckTime);
                         Date date= DateUtils.parseDate(bkTime, "yyyy-MM-dd HH:mm");
                         //生成补卡记录信息
-                        getIRzAttendanceService().addRzOverTime(json.toString(), sysStaff, dingsShiftGroup, checkType, date,  date, "/", "钉钉补卡-"+bkYi, ParamUtils.getDebiting());
+                        getIRzAttendanceService().addRzOverTime(json.toString(), sysStaff, dingsShiftGroup, checkType, date,  date, "/", "钉钉补卡-"+bkYi, ParamUtils.getDebiting(), null);
                     }
                 }
             } catch (ParseException e) {
diff --git a/evo-admin/src/main/resources/application-local.yml b/evo-admin/src/main/resources/application-local.yml
index 57e972b..eb4427b 100644
--- a/evo-admin/src/main/resources/application-local.yml
+++ b/evo-admin/src/main/resources/application-local.yml
@@ -32,7 +32,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/evo_cw_dev_ding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.5.232:3306/evo_cw_dev_ding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: hbyt123456
                 #username: root