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

变更查看当前用户今日打卡返回实体

Browse Source
This commit is contained in:
罗成
2025-02-27 10:44:04 +08:00
parent e50082fe20
commit 399a70c564
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
View File

@ -261,9 +261,9 @@ public class WgzAppController {
} }
/** /**
* 【考勤打卡】【打卡】 提交上下班打卡·查看当前用户的打卡状态（0上班 1下班 2请假） * 【考勤打卡】【打卡】 提交上下班打卡·查看当前用户的打卡状态
*/ */
@ApiOperation("【考勤打卡】【打卡】 提交上下班打卡·用户今日打卡状态（0上班 1下班 2请假）") @ApiOperation("【考勤打卡】【打卡】 提交上下班打卡·用户今日打卡状态")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userClockingCondition')") //@PreAuthorize("@ss.hasPermi('wgzApp:user:userClockingCondition')")
@GetMapping("/WgzAppUserClockingCondition") @GetMapping("/WgzAppUserClockingCondition")
public AjaxResult<WgzAppUserClockingConditionRes> userClockingCondition() { public AjaxResult<WgzAppUserClockingConditionRes> userClockingCondition() {

6
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserClockingConditionRes.java
View File

@ -15,4 +15,10 @@ import java.io.Serializable;
public class WgzAppUserClockingConditionRes implements Serializable { public class WgzAppUserClockingConditionRes implements Serializable {
@ApiModelProperty("务工者今日打卡状态：0上班 1下班 2请假 3已完成") @ApiModelProperty("务工者今日打卡状态：0上班 1下班 2请假 3已完成")
private Integer clockingCondition; private Integer clockingCondition;
@ApiModelProperty("上班状态：0正常 1迟到 2缺卡 3补卡 4请假")
private Integer in;
@ApiModelProperty("下班状态：0正常 1早退 2缺卡 3补卡 4请假")
private Integer out;
} }

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

@ -241,14 +241,43 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
res.setClockingCondition(0); //上班 res.setClockingCondition(0); //上班
}else{ }else{
res.setClockingCondition(1); //下班 res.setClockingCondition(1); //下班
//上下班都打卡了就是已完成 if (wgzAttendance.getLeaveMarkId() == null && wgzAttendance.getClockInTime()!=null && wgzAttendance.getClockOutTime()!=null){
if (wgzAttendance.getClockInTime()!=null && wgzAttendance.getClockOutTime()!=null){
res.setClockingCondition(3); //已完成 res.setClockingCondition(3); //已完成
} }
if (wgzAttendance.getLeaveMarkId()!= null && wgzAttendance.getLeaveMarkId()!= 0) { if (wgzAttendance.getLeaveMarkId() != null && wgzAttendance.getLeaveMarkId()!= 0) {
res.setClockingCondition(2); //请假 res.setClockingCondition(2); //请假
} }
} }
//3、获取上下班状态
if (wgzAttendance!= null) {
String exceptionType = wgzAttendance.getExceptionType();
if (exceptionType.contains("0")) {
res.setIn(0);
res.setOut(0);
}
if (exceptionType.contains("1")) {
res.setIn(1);
}
if (exceptionType.contains("2")) {
res.setOut(1);
}
if (exceptionType.contains("3")) {
res.setIn(2);
}
if (exceptionType.contains("4")) {
res.setOut(2);
}
if (exceptionType.contains("5")) {
res.setIn(3);
}
if (exceptionType.contains("6")) {
res.setOut(3);
}
if (exceptionType.contains("7")) {
res.setIn(4);
res.setOut(4);
}
}
return res; return res;
} }