From 0e156418d93d3a6dfdb768b53e88d2b1f240bf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Wed, 5 Mar 2025 16:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=89=93=E5=8D=A1=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E7=8F=AD=E6=89=93=E5=8D=A1=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java  | 5 ++++-
 .../main/java/com/ruoyi/wgz/domain/WgzAttendance.java    | 9 +++++++--
 .../ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java | 6 ++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java
index 87abde5..2c29bcf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/rests/WgzAppPunchTheCalendarRecordThree.java
@@ -17,9 +17,12 @@ public class WgzAppPunchTheCalendarRecordThree implements Serializable {
 	@ApiModelProperty("打卡时间")
 	private LocalDateTime clockingTime;
 
-	@ApiModelProperty("打卡位置")
+	@ApiModelProperty("打卡位置（上班）")
 	private String pnchOsition;
 
+	@ApiModelProperty("打卡位置（下班）")
+	private String pnchOsitionX;
+
 	@ApiModelProperty("打卡状态（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5上班补卡 6下班补卡 7请假）")
 	private Integer clockingCondition;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java
index 69db45b..0a0cfe2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java
@@ -63,8 +63,8 @@ public class WgzAttendance implements Serializable {
     private LocalDate date;
 
     /** 打卡位置 */
-    @Excel(name = "打卡位置")
-    @ApiModelProperty("打卡位置")
+    @Excel(name = "打卡位置（上班）")
+    @ApiModelProperty("打卡位置（上班）")
     private String pnchOsition;
 
     /** 上班时间 */
@@ -72,6 +72,11 @@ public class WgzAttendance implements Serializable {
     @ApiModelProperty("上班时间")
     private LocalDateTime clockInTime;
 
+	/** 打卡位置 */
+	@Excel(name = "打卡位置（下班）")
+	@ApiModelProperty("打卡位置（下班）")
+	private String pnchOsitionX;
+
     /** 下班时间 */
     @Excel(name = "下班时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("下班时间")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
index b217053..f5b5ac3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
@@ -185,8 +185,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 			setRecruitId(appById.getId()).
 			setUserId(appUserId).
 			setDailyWage(appById.getRecruitAmount()).
-			setDate(LocalDate.now()).
-			setPnchOsition(req.getPnchOsition());
+			setDate(LocalDate.now());
 		LocalDateTime now = LocalDateTime.now(); //当前完整年月日时分秒
 		LocalTime localTime = now.toLocalTime(); //获取时分秒
 		if (we !=null) {
@@ -203,6 +202,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 				wgzAttendance.setEarlyLeave(1); //早退
 				wgzAttendance.setEarlyLeaveTime(now);
 				wgzAttendance.setExceptionType(exceptionType+"2,");
+				wgzAttendance.setPnchOsitionX(req.getPnchOsition());
 			}
 			return baseMapper.updateById(wgzAttendance) > 0;
 		}else{
@@ -212,6 +212,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 				wgzAttendance.setLate(1); //迟到
 				wgzAttendance.setLateTime(now);
 				wgzAttendance.setExceptionType("1,");
+				wgzAttendance.setPnchOsition(req.getPnchOsition());
 			}
 			return baseMapper.insert(wgzAttendance) > 0;
 		}
@@ -527,6 +528,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 		WgzAppPunchTheCalendarRecordThree sbb = new WgzAppPunchTheCalendarRecordThree().
 			setClockingTime(wa.getClockInTime()).
 			setPnchOsition(wa.getPnchOsition()).
+			setPnchOsitionX(wa.getPnchOsitionX()).
 			setClockingCondition(0); //正常
 		//判断是否请假
 		if (wa.getLeaveMarkId()!=null && wa.getLeaveMarkId()!=0) {