From 57e0061da9b3788b50104b4a735121617d3df5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Tue, 15 Apr 2025 17:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wgz/bo/res/WgzAppUserApplyForPayrollSettlementDetails.java | 3 +++
 .../ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java   | 1 +
 .../src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserApplyForPayrollSettlementDetails.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserApplyForPayrollSettlementDetails.java
index 8202607..82840ad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserApplyForPayrollSettlementDetails.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserApplyForPayrollSettlementDetails.java
@@ -82,6 +82,9 @@ public class WgzAppUserApplyForPayrollSettlementDetails {
 	@ApiModelProperty("招工ID")
 	private Long recruitId;
 
+	@ApiModelProperty("招工申请ID")
+	private Long recruitApplyId;
+
 	@ApiModelProperty("务工者ID")
 	private Long userId;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
index 9cc7be6..8040d79 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
@@ -401,6 +401,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 				.eq(WgzPayCalculationFiles::getCalculationId, id)
 		);
 		wgz.setFiles(files);
+		wgz.setRecruitApplyId(wgzPayCalculation.getApplyKey());
 		return wgz;
 	}
 
diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml
index 5a38693..d1b0a50 100644
--- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fbs_project_task as c ON (c.id = b.task_id)
             LEFT JOIN sys_dict_data as d ON (d.dict_type = 'type_of_work' and d.dict_value = b.type_of_work)
         WHERE
-            b.id not in (SELECT recruit_id FROM bgt_project_recruit_apply WHERE user_id = #{req.userId} and status in ("3","5")) and
+            b.id not in (SELECT recruit_id FROM bgt_project_recruit_apply WHERE user_id = #{req.userId} and status in ("0","1","3","5")) and
             b.status = '1' and
             DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN b.recruit_begin_time AND b.recruit_end_time and
             b.del_flag = 0