From 5616b4db4a8c4ae7fe3109dfc362ed22a2a722bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Fri, 6 Feb 2026 13:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=9C=BA=E6=97=B6=E9=97=B4=E5=92=8C?= =?UTF-8?q?=E5=87=BA=E5=9C=BA=E6=97=B6=E9=97=B4=E5=89=8D=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/person/service/InOutServiceImpl.java | 18 +++++++++++++++--- .../service/PersonComprehensiveServiceImp.java | 9 +++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java index b0f5917..5c039c9 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java @@ -219,7 +219,11 @@ public class InOutServiceImpl implements InOutService { dealWithAttendanceMachine(idNumber); o.setEinStatus(bean.getEinStatus()); o.setIdNumber(idNumber); - o.setExitTime(DateUtils.getTime()); + if(StringUtils.isEmpty(bean.getExitTime())){ + o.setExitTime(DateUtils.getTime()); + }else{ + o.setExitTime(bean.getExitTime()); + } o.setUserId(bean.getUserId()); o.setExitExamineRemark(bean.getExitExamineRemark()); o.setExitStatus("1"); @@ -270,7 +274,11 @@ public class InOutServiceImpl implements InOutService { dealWithAttendanceMachine(idNumber); o.setEinStatus(bean.getEinStatus()); o.setIdNumber(idNumber); - o.setExitTime(DateUtils.getTime()); + if(StringUtils.isEmpty(bean.getExitTime())){ + o.setExitTime(DateUtils.getTime()); + }else{ + o.setExitTime(bean.getExitTime()); + } o.setUserId(bean.getUserId()); o.setExitExamineRemark(bean.getExitExamineRemark()); o.setExitStatus("1"); @@ -355,7 +363,11 @@ public class InOutServiceImpl implements InOutService { for (int i = 0; i < split.length; i++) { BasePersonBean o = new BasePersonBean(); o.setIdNumber(split[i]); - o.setExitTime(DateUtils.getTime()); + if(StringUtils.isEmpty(bean.getExitTime())){ + o.setExitTime(DateUtils.getTime()); + }else{ + o.setExitTime(bean.getExitTime()); + } o.setUserId(userId); o.setExitStatus(bean.getExitStatus()); o.setExitExamineRemark(bean.getExitExamineRemark()); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java index 434b103..610f4fe 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java @@ -3,6 +3,7 @@ package com.bonus.bmw.person.service; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelWriter; +import com.bonus.common.core.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import com.bonus.bmw.attendanceMachine.dao.AttendanceMachineDao; import com.bonus.bmw.basic.dao.UserDao; @@ -304,7 +305,9 @@ public class PersonComprehensiveServiceImp implements PersonComprehensiveService if (StringUtils.isEmpty(o.getPostId())) { o.setPostId("0"); } - o.setEinTime(DateUtil.now()); + if(StringUtils.isEmpty(o.getExitTime())){ + o.setEinTime(DateUtil.now()); + } //查一下上一次出场是不是同一个工程 PersonComprehensiveBean po = dao.getPrevEinHistoryProId(o); dao.insertPersonEinData(o); @@ -573,7 +576,9 @@ public class PersonComprehensiveServiceImp implements PersonComprehensiveService if (StringUtils.isEmpty(o.getPostId())) { o.setPostId("0"); } - o.setEinTime(DateUtil.now()); + if(StringUtils.isEmpty(o.getExitTime())){ + o.setEinTime(DateUtil.now()); + } if (o.getEinStatus().equals("0") && o.getIsFurloughPerson().equals("0")) { //查一下上一次出场是不是同一个工程 PersonComprehensiveBean po = dao.getPrevEinHistoryProId(o);