bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

入场时间和出场时间前端上传

This commit is contained in:
方亮 2026-02-06 13:08:52 +08:00
parent 9ce8d6ac89
commit 5616b4db4a
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/bmw/src/main/java/com/bonus/bmw/person/service/InOutServiceImpl.java
View File

@ -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());

9
modules/bmw/src/main/java/com/bonus/bmw/person/service/PersonComprehensiveServiceImp.java
View File

@ -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);