zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

考勤打卡追加下班打卡位置

Browse Source
This commit is contained in:
罗成
2025-03-05 16:11:15 +08:00
parent f12f252904
commit 0e156418d9
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java
View File

@ -17,9 +17,12 @@ public class WgzAppPunchTheCalendarRecordThree implements Serializable {
@ApiModelProperty("打卡时间") @ApiModelProperty("打卡时间")
private LocalDateTime clockingTime; private LocalDateTime clockingTime;
@ApiModelProperty("打卡位置") @ApiModelProperty("打卡位置（上班）")
private String pnchOsition; private String pnchOsition;
@ApiModelProperty("打卡位置（下班）")
private String pnchOsitionX;
@ApiModelProperty("打卡状态（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5上班补卡 6下班补卡 7请假）") @ApiModelProperty("打卡状态（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5上班补卡 6下班补卡 7请假）")
private Integer clockingCondition; private Integer clockingCondition;

9
ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java
View File

@ -63,8 +63,8 @@ public class WgzAttendance implements Serializable {
private LocalDate date; private LocalDate date;
/** 打卡位置 */ /** 打卡位置 */
@Excel(name = "打卡位置") @Excel(name = "打卡位置（上班）")
@ApiModelProperty("打卡位置") @ApiModelProperty("打卡位置（上班）")
private String pnchOsition; private String pnchOsition;
/** 上班时间 */ /** 上班时间 */
@ -72,6 +72,11 @@ public class WgzAttendance implements Serializable {
@ApiModelProperty("上班时间") @ApiModelProperty("上班时间")
private LocalDateTime clockInTime; private LocalDateTime clockInTime;
/** 打卡位置 */
@Excel(name = "打卡位置（下班）")
@ApiModelProperty("打卡位置（下班）")
private String pnchOsitionX;
/** 下班时间 */ /** 下班时间 */
@Excel(name = "下班时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "下班时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("下班时间") @ApiModelProperty("下班时间")

6
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -185,8 +185,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
setRecruitId(appById.getId()). setRecruitId(appById.getId()).
setUserId(appUserId). setUserId(appUserId).
setDailyWage(appById.getRecruitAmount()). setDailyWage(appById.getRecruitAmount()).
setDate(LocalDate.now()). setDate(LocalDate.now());
setPnchOsition(req.getPnchOsition());
LocalDateTime now = LocalDateTime.now(); //当前完整年月日时分秒 LocalDateTime now = LocalDateTime.now(); //当前完整年月日时分秒
LocalTime localTime = now.toLocalTime(); //获取时分秒 LocalTime localTime = now.toLocalTime(); //获取时分秒
if (we !=null) { if (we !=null) {
@ -203,6 +202,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
wgzAttendance.setEarlyLeave(1); //早退 wgzAttendance.setEarlyLeave(1); //早退
wgzAttendance.setEarlyLeaveTime(now); wgzAttendance.setEarlyLeaveTime(now);
wgzAttendance.setExceptionType(exceptionType+"2,"); wgzAttendance.setExceptionType(exceptionType+"2,");
wgzAttendance.setPnchOsitionX(req.getPnchOsition());
} }
return baseMapper.updateById(wgzAttendance) > 0; return baseMapper.updateById(wgzAttendance) > 0;
}else{ }else{
@ -212,6 +212,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
wgzAttendance.setLate(1); //迟到 wgzAttendance.setLate(1); //迟到
wgzAttendance.setLateTime(now); wgzAttendance.setLateTime(now);
wgzAttendance.setExceptionType("1,"); wgzAttendance.setExceptionType("1,");
wgzAttendance.setPnchOsition(req.getPnchOsition());
} }
return baseMapper.insert(wgzAttendance) > 0; return baseMapper.insert(wgzAttendance) > 0;
} }
@ -527,6 +528,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
WgzAppPunchTheCalendarRecordThree sbb = new WgzAppPunchTheCalendarRecordThree(). WgzAppPunchTheCalendarRecordThree sbb = new WgzAppPunchTheCalendarRecordThree().
setClockingTime(wa.getClockInTime()). setClockingTime(wa.getClockInTime()).
setPnchOsition(wa.getPnchOsition()). setPnchOsition(wa.getPnchOsition()).
setPnchOsitionX(wa.getPnchOsitionX()).
setClockingCondition(0); //正常 setClockingCondition(0); //正常
//判断是否请假 //判断是否请假
if (wa.getLeaveMarkId()!=null && wa.getLeaveMarkId()!=0) { if (wa.getLeaveMarkId()!=null && wa.getLeaveMarkId()!=0) {