From 118c1a6ddf58f8dd6c6cfdca9973133700e0da3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Fri, 21 Mar 2025 15:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/bgt/service/IBgtProjectRecruitApplyService.java  | 1 +
 .../service/impl/BgtProjectRecruitApplyServiceImpl.java    | 1 +
 .../java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java | 7 +++++++
 .../ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java   | 3 +++
 .../ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java   | 3 +++
 .../com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java    | 5 ++++-
 .../ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java | 3 +++
 .../src/main/resources/mapper/wgz/WgzMessageMapper.xml     | 6 ++++++
 8 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java
index fa95b71..3dc374d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java
@@ -167,4 +167,5 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
 	 * 根据招工和务工者Id获该务工者的最近一条申请信息(只查进场和立场)
 	 */
 	BgtProjectRecruitApply getOneByUserIdAndRecruitId(Long userId, Long recruitId);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
index f4d82a8..b3a7938 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
@@ -760,4 +760,5 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 			.orderByDesc(BgtProjectRecruitApply::getCreateTime));
 		return list.get(0);
 	}
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java
index 5f9abcc..d4939af 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java
@@ -8,6 +8,9 @@ import io.swagger.v3.oas.annotations.Hidden;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 @Data
 @NoArgsConstructor
@@ -22,4 +25,8 @@ public class WgzAppGetMessageListReq extends PageReq {
 
 	@ApiModelProperty("字典（message_small_type）largeType为3填写")
 	private String smallType;
+
+	@ApiModelProperty(value = "日期（格式：年-月-日）,不填查全部")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate rq;
 }
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 87f591a..a24b827 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
@@ -161,6 +161,9 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 		Long appUserId = SecurityUtils.getAppUserId();
 		//2、获取当前用户所在的工地id
 		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+		if (!(by.getStatus().equals("5") && by.getEntryTime()!=null)) {
+			throw new RuntimeException("包工头还未确认进场！");
+		}
 		//3、根据工地id得到完整的工地信息
 		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
 		//4、在进场时间时才能打卡，如果有退场记录就不允许打卡
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
index 351e1b9..92b0a16 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
@@ -244,6 +244,9 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 		//1、获取当前人、当前工的上下班时间范围
 		Long appUserId = SecurityUtils.getAppUserId();
 		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+		if (!(by.getStatus().equals("5") && by.getEntryTime()!=null)) {
+			throw new RuntimeException("包工头还未确认进场！");
+		}
 		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
 		//2、为补卡时now的时间就为前端传递的日期
 		LocalDateTime now = LocalDateTime.now();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
index 227d91a..babe921 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
@@ -150,8 +150,11 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
 		//1、现获取用户的唯一标识
 		SysUser user = SecurityUtils.getLoginUser().getUser();
 		Long appUserId = user.getUserId();
-		//2、根据唯一标识获取到当前用户的招工
+		//2、根据唯一标识获取到当前用户的招工(并判断当前项目是否进场)
 		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+		if (!(by.getStatus().equals("5") && by.getEntryTime()!=null)) {
+			throw new RuntimeException("包工头还未确认进场！");
+		}
 		//3、根据招工id获取到具体招工信息
 		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
 		//4、查看当前用户、当前招工、当前请假时间段是否有重复的请假
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
index f7aef7b..50bf0db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
@@ -156,6 +156,9 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
 		//1、获取当前用户信息
 		Long appUserId = SecurityUtils.getAppUserId();
 		BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+		if (!(recruitApply.getStatus().equals("5") && recruitApply.getEntryTime()!=null)) {
+			throw new RuntimeException("包工头还未确认进场！");
+		}
 		BgtProjectRecruit recruit = iBgtProjectRecruitService.getAppById(recruitApply.getRecruitId());
 		//4、获取到原打卡的信息
 		WgzAttendance attendanceInfo = iWgzAttendanceService.findById(req.getAttendanceId());
diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml
index 34d7ae2..cc1ebde 100644
--- a/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml
@@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="req.smallType !=null and req.smallType!=''">
                 AND a.message_small_type = #{req.smallType}
             </if>
+            <if test="req.rq!=null">
+                DATE_FORMAT(a.create_time, '%Y-%m-%d') = #{req.rq} and
+            </if>
         </where>
         order by a.create_time desc
     </select>
@@ -128,6 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="req.largeType !=null and req.largeType!='3'">
                 a.is_operation = '1' AND
             </if>
+            <if test="req.rq!=null">
+                DATE_FORMAT(a.create_time, '%Y-%m-%d') = #{req.rq} and
+            </if>
             a.message_small_type is null AND
             a.del_flag = "0"
         </where>