From bed482475ba47cbb946a6a5d7bb4f7b5e7f494d6 Mon Sep 17 00:00:00 2001 From: zt Date: Wed, 12 Mar 2025 17:05: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 --- .../controller/bgt/AppBgtAttendanceController.java | 4 +++- .../bgt/domain/dto/BgtAttendanceDetailDTO.java | 3 +++ .../domain/vo/BgtAttendancePersonBaseInfoVO.java | 7 +++++-- .../bgt/domain/vo/BgtAttendancePersonCountVO.java | 2 +- .../impl/BgtProjectRecruitApplyServiceImpl.java | 8 -------- .../impl/BgtWageApplicationServiceImpl.java | 2 +- .../mapper/bgt/BgtProjectRecruitApplyMapper.xml | 14 +++++++++----- 7 files changed, 22 insertions(+), 18 deletions(-) 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 appQueryPageList(BgtProjectRecruitApplyQueryDTO dto) { - if (dto.getTaskId() != null) { - List 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 and wu.username like concat('%', #{dto.username}, '%') - - AND bpra.recruit_id IN - - #{recruitId} - + + AND bpra.task_id = #{dto.taskId} + + + + + + AND bpra.status IN