From 330e4e5b8bb8eec4779121b79d3b5c33920e1778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Wed, 12 Mar 2025 16:29:54 +0800
Subject: [PATCH] 111

---
 .../web/controller/wgz/controller/WgzAppController.java   | 3 +++
 .../bgt/service/impl/BgtProjectRecruitServiceImpl.java    | 2 ++
 .../bo/res/WgzAppCancelRegistrationProjectDetailsRes.java | 8 +++++++-
 .../wgz/bo/res/WgzAppRegistrationInformationRes.java      | 2 +-
 .../ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java  | 5 ++---
 .../com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
index 28c85e2..74ca215 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
@@ -390,6 +390,7 @@
 			return AjaxResult.success(iBgtProjectRecruitService.userCancelRegistrationProjectDetails(req));
 		}
 
+
 		/**
 		 * 【首页】【项目进行中】 项目进行中（分页，但是理论上这里始终只会有一条数据）
 		 * 【首页】【已完成项目】 已完成项目
@@ -521,6 +522,8 @@
 
 
 
+
+
 		/**
 		 * 通用接口
 		 * =================================================================================================================
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
index 5303281..24066b2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
@@ -278,12 +278,14 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
 				.in(WgzMessage::getTableName, SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
 		);
 		if (one !=null){
+			res.setMessageId(one.getId());
 			res.setIsOperation(one.getIsOperation());
 		}
 		res.setFull(wgzAppProjectDetailsRes.getStatus());
 		//5、获取当前申请人是否操作的对应状态
 		BgtProjectRecruitApply byId = bgtProjectRecruitApplyService.getById(req.getRecruitApplyId());
 		res.setStatus(byId.getStatus());
+		res.setRecruitApplyId(byId.getId());
 		return res;
 	}
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
index 9799ae6..9ef4082 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
@@ -23,6 +23,9 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
 	@ApiModelProperty("主键ID")
 	private Long id;
 
+	@ApiModelProperty("招工申请主键ID")
+	private Long recruitApplyId;
+
 	@ApiModelProperty("项目ID")
 	private Long projectId;
 
@@ -105,10 +108,13 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
 	//-----------
 	//-----------
 	//-----------
+	@ApiModelProperty("消息主键ID")
+	private Long messageId;
+
 	@ApiModelProperty("是否需要操作（0不需要 1需要 2已操作）")
 	private String isOperation;
 
-	@ApiModelProperty("招工是否正常（0正常 1已招满 2已失效）")
+	@ApiModelProperty("招工是否正常（1正常 2已招满 3已失效）")
 	private String full;
 
 	@ApiModelProperty("务工者状态：0报名 1包工同意  2包工头拒绝 3务工者同意  4务工者拒绝  5进场 6离场 7取消")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java
index ad47e87..bc4984d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java
@@ -82,7 +82,7 @@ public class WgzAppRegistrationInformationRes implements Serializable {
 	@ApiModelProperty("招工是否正常（0正常 1已招满 2已失效）")
 	private String full;
 
-	@ApiModelProperty("务工者同意拒绝状态：3务工者同意  4务工者拒绝")
+	@ApiModelProperty("务工者状态：0报名 1包工同意  2包工头拒绝 3务工者同意  4务工者拒绝  5进场 6离场 7取消")
 	private String status;
 
 //	@ApiModelProperty("附件实体数据")
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 f57d611..97b5871 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
@@ -51,8 +51,7 @@ import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
-import static com.ruoyi.common.constants.BgtMessageConstant.BGT_SMALL_MAKE_UP;
-import static com.ruoyi.common.constants.BgtMessageConstant.BGT_TYPE_SIGN_UP;
+import static com.ruoyi.common.constants.BgtMessageConstant.*;
 import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*;
 import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.USERTYPE_BGT;
 
@@ -275,7 +274,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 				setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"212")).
 				setTableId(dc.getId()).
 				setTableName(SqlHelper.table(WgzDailyClock.class).getTableName()).
-				setMessageLargeType(BGT_TYPE_SIGN_UP).
+				setMessageLargeType(BGT_LARGE_OTHER).
 				setMessageSmallType(BGT_SMALL_MAKE_UP);
 			if (!iBgtMessageService.sendAMessage(bgtMessage)){
 				throw new RuntimeException("发送日报补卡消息失败！");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
index 871175b..375d6f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
@@ -237,7 +237,7 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
 		if(count == num){
 			return "1"; //已招满
 		}
-		if (!LocalDate.now().isBefore(recruitEndTime)){
+		if (LocalDate.now().isAfter(recruitEndTime)){
 			return "2"; //已失效
 		}
 		return "0";