diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtAttendanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtAttendanceController.java
index 6b8abbc..ad453d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtAttendanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtAttendanceController.java
@@ -64,13 +64,15 @@ public class AppBgtAttendanceController {
 		vo.setUserId(wgzUser.getUserId());
 		vo.setUsername(wgzUser.getUsername());
 		vo.setAvatarName(wgzUser.getAvatarName());
+		vo.setIdentityCard(wgzUser.getIdentityCard());
 
 		//务工者的申请信息
-		BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getOne(dto.getTaskId(),wgzUser.getUserId());
+		BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(dto.getRecruitApplyId());
 		vo.setEntryTime(recruitApply.getEntryTime());
 		vo.setLeaveTime(recruitApply.getLeaveTime());
 		vo.setStatus(recruitApply.getStatus());
 
+
 		return AjaxResult.success(vo);
 	}
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtAttendanceDetailDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtAttendanceDetailDTO.java
index a8a2a3a..a357429 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtAttendanceDetailDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtAttendanceDetailDTO.java
@@ -29,4 +29,7 @@ public class BgtAttendanceDetailDTO {
 	@ApiModelProperty("日期")
 	private LocalDate date;
 
+	@ApiModelProperty("招工申请ID")
+	private Long recruitApplyId;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonBaseInfoVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonBaseInfoVO.java
index 5137063..c997bcb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonBaseInfoVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonBaseInfoVO.java
@@ -12,7 +12,7 @@ import java.time.LocalDate;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@ApiModel("App包工头总体考勤视图对象")
+@ApiModel("App包工头个人考勤基础信息视图对象")
 public class BgtAttendancePersonBaseInfoVO {
 
 	@ApiModelProperty("务工者Id")
@@ -25,12 +25,15 @@ public class BgtAttendancePersonBaseInfoVO {
 	@ApiModelProperty("头像")
 	private String avatarName;
 
+	@ApiModelProperty("身份证号码")
+	private String identityCard;
+
 	@ApiModelProperty("进场时间")
 	private LocalDate entryTime;
 
 	@ApiModelProperty("离场时间")
 	private LocalDate leaveTime;
 
-	@ApiModelProperty("选择状态（0未选择 1已选择）")
+	@ApiModelProperty("0报名 1包工同意  2包工头拒绝（截止时间）3务工者同意  4务工者拒绝  5进场 6离场")
 	private String status;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonCountVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonCountVO.java
index 8fffdc9..45b13f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonCountVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtAttendancePersonCountVO.java
@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@ApiModel("App包工头总体考勤视图对象")
+@ApiModel("App包工头个人考勤统计视图对象")
 public class BgtAttendancePersonCountVO {
 
 	@ApiModelProperty("出勤天数")
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 3426cfc..269da07 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
@@ -146,14 +146,6 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 
 	@Override
 	public TableDataInfo<BgtProjectRecruitApplyVO> appQueryPageList(BgtProjectRecruitApplyQueryDTO dto) {
-		if (dto.getTaskId() != null) {
-			List<Long> recruitIdsByTaskId = iBgtProjectRecruitService.getRecruitIdsByTaskId(dto.getTaskId());
-			if (dto.getRecruitIds() == null) {
-				dto.setRecruitIds(recruitIdsByTaskId);
-			} else {
-				dto.getRecruitIds().addAll(recruitIdsByTaskId);
-			}
-		}
 		if(dto.getDate()!=null){
 			LocalDate date = dto.getDate();
 			dto.setBeginDate(date.with(TemporalAdjusters.firstDayOfMonth()));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java
index 30ccb8f..1421a3a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java
@@ -101,7 +101,7 @@ public class BgtWageApplicationServiceImpl extends ServicePlusImpl<BgtWageApplic
 			.setRecipientId(add.getUserId())
 			.setHeadline(map.get(HEADLINE))
 			.setSubheading(map.get(SUBHEADING))
-			.setTableId(task.getId())
+			.setTableId(add.getId())
 			.setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
 			.setMessageLargeType(BGT_LARGE_SETTLEMENT);
 		bgtMessageService.sendAMessage(bgtMessage);
diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml
index 11bbd8e..de07bff 100644
--- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 wu.score,
                 wu.avatar_name,
                 wu.username,
+                wu.identity_card,
                 bpra.status,
                 wu.type_of_work,
                 bpr.recruit_name,
@@ -41,12 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.username !=null and dto.username !='' ">
                 and wu.username like concat('%', #{dto.username}, '%')
             </if>
-            <if test="dto.recruitIds != null and dto.recruitIds.size() > 0">
-                AND bpra.recruit_id IN
-                <foreach collection="dto.recruitIds" item="recruitId" open="(" separator="," close=")">
-                    #{recruitId}
-                </foreach>
+            <if test="dto.taskId != null">
+                AND bpra.task_id = #{dto.taskId}
             </if>
+<!--            <if test="dto.recruitIds != null and dto.recruitIds.size() > 0">-->
+<!--                AND bpra.recruit_id IN-->
+<!--                <foreach collection="dto.recruitIds" item="recruitId" open="(" separator="," close=")">-->
+<!--                    #{recruitId}-->
+<!--                </foreach>-->
+<!--            </if>-->
             <if test="dto.status != null and dto.status.size() > 0">
                 AND bpra.status IN
                 <foreach collection="dto.status" item="item" open="(" separator="," close=")">