From 531e345920d8546cb6d42702b13ea5d4611af569 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 24 Mar 2025 11:00:51 +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 --- .../bgt/AppBgtMessageController.java | 8 +++ .../bgt/AppBgtPayCalculationController.java | 8 +-- .../ruoyi/bgt/domain/BgtProjectRecruit.java | 4 ++ .../domain/dto/BgtApplyForWgzPayAddDTO.java | 3 + .../dto/BgtMessageUnAuditDetailDTO.java | 51 +++++++++++++ .../dto/BgtPayCalculationRecordDTO.java | 3 + .../ruoyi/bgt/service/IBgtMessageService.java | 6 ++ .../service/impl/BgtMessageServiceImpl.java | 71 +++++++++++++++++++ .../common/constants/BgtMessageConstant.java | 3 + .../com/ruoyi/fbs/domain/FbsProjectTask.java | 4 ++ .../wgz/service/IWgzAttendanceService.java | 5 ++ .../service/IWgzPayCalculationService.java | 4 +- .../impl/WgzAttendanceServiceImpl.java | 42 ++++++++--- .../impl/WgzPayCalculationServiceImpl.java | 39 +++++----- 14 files changed, 217 insertions(+), 34 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageUnAuditDetailDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java index c239c40..01b9c1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java @@ -4,6 +4,7 @@ import com.ruoyi.bgt.domain.BgtMessage; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO; import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO; +import com.ruoyi.bgt.domain.dto.BgtMessageUnAuditDetailDTO; import com.ruoyi.bgt.domain.vo.BgtMessageCountVO; import com.ruoyi.bgt.domain.vo.BgtMessageDetailVO; import com.ruoyi.bgt.domain.vo.BgtMessageVO; @@ -88,4 +89,11 @@ public class AppBgtMessageController extends BaseController { } + @ApiOperation("未审批消息详情列表") + @GetMapping("/unAuditList") + public TableDataInfo unAuditList(BgtMessageUnAuditDetailDTO dto) { + return iBgtMessageService.unAuditList(dto); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java index 46edc91..861c18d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java @@ -71,8 +71,8 @@ public class AppBgtPayCalculationController extends BaseController { @ApiOperation("总体考勤情况-工资结算-基础信息") @GetMapping("/baseInfo") - public AjaxResult baseInfo(Long userId, Long recruitId) { - return AjaxResult.success(iWgzPayCalculationService.baseInfo(userId,recruitId)); + public AjaxResult baseInfo(Long userId, Long recruitApplyId) { + return AjaxResult.success(iWgzPayCalculationService.baseInfo(userId,recruitApplyId)); } @ApiOperation("总体考勤情况-工资结算-结算记录") @@ -93,8 +93,8 @@ public class AppBgtPayCalculationController extends BaseController { @ApiOperation("总体考勤情况-工资结算-获取工资结算所需的信息") @GetMapping("/payInfo") - public AjaxResult payInfo(Long userId, Long recruitId) { - return AjaxResult.success(iWgzPayCalculationService.payInfo(userId,recruitId)); + public AjaxResult payInfo(Long userId, Long recruitApplyId) { + return AjaxResult.success(iWgzPayCalculationService.payInfo(userId,recruitApplyId)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java index 80225a9..4d3a012 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; @@ -83,6 +84,7 @@ public class BgtProjectRecruit implements Serializable { */ @Excel(name = "招工金额") @ApiModelProperty("招工金额") + @Pattern(regexp = "^[0-9]+(\\.[0-9]{1,2})?$",message = "只能两位小数的数字") private BigDecimal recruitAmount; /** @@ -90,6 +92,7 @@ public class BgtProjectRecruit implements Serializable { */ @Excel(name = "招工数量") @ApiModelProperty("招工数量") + @Pattern(regexp = "^[0-9]+$",message = "只能是整数") private Integer recruitStaffNum; /** @@ -116,6 +119,7 @@ public class BgtProjectRecruit implements Serializable { */ @Excel(name = "联系电话") @ApiModelProperty("联系电话") + @Pattern(regexp = "^[0-9]+$",message = "联系电话只能是数字") private String recruitContactPhone; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtApplyForWgzPayAddDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtApplyForWgzPayAddDTO.java index 1fb185d..9002eb3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtApplyForWgzPayAddDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtApplyForWgzPayAddDTO.java @@ -25,6 +25,9 @@ public class BgtApplyForWgzPayAddDTO implements Serializable { @ApiModelProperty("招工ID") private Long recruitId; + @ApiModelProperty("招工申请ID") + private Long recruitApplyId; + @ApiModelProperty("任务名称") private String taskName; diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageUnAuditDetailDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageUnAuditDetailDTO.java new file mode 100644 index 0000000..fd5ca5a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageUnAuditDetailDTO.java @@ -0,0 +1,51 @@ +package com.ruoyi.bgt.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.time.LocalDate; + +/** + * 消息对象 bgt_message + * + * @author ruoyi + * @date 2025-02-25 + */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("务工者未审批消息对象") +public class BgtMessageUnAuditDetailDTO { + + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate date; + +// @ApiModelProperty("大类型（字典bgt_message_large_type）") +// private String messageLargeType; + + @ApiModelProperty("小类型（字典bgt_message_small_type）") + private String messageSmallType; + + @ApiModelProperty("务工者ID") + @NotNull(message = "未指定用户") + private Long userId; + +// @ApiModelProperty("是否待处理") +// private Boolean isHandle = false; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationRecordDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationRecordDTO.java index bbb5e70..0f45697 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationRecordDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtPayCalculationRecordDTO.java @@ -32,5 +32,8 @@ public class BgtPayCalculationRecordDTO { @ApiModelProperty("申请人ID") private Long userId; + @ApiModelProperty("招工申请ID") + private Long recruitApplyId; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtMessageService.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtMessageService.java index 21de93a..877eb51 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtMessageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtMessageService.java @@ -4,6 +4,7 @@ import com.ruoyi.bgt.bo.BgtMessageQueryBo; import com.ruoyi.bgt.domain.BgtMessage; import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO; import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO; +import com.ruoyi.bgt.domain.dto.BgtMessageUnAuditDetailDTO; import com.ruoyi.bgt.domain.vo.BgtMessageCountVO; import com.ruoyi.bgt.domain.vo.BgtMessageDetailVO; import com.ruoyi.bgt.domain.vo.BgtMessageVO; @@ -85,6 +86,11 @@ public interface IBgtMessageService extends IServicePlus { */ TableDataInfo queryDetailPageList(BgtMessageDetailDTO dto); + /** + * 务工者未读消息详情列表 + */ + TableDataInfo unAuditList(BgtMessageUnAuditDetailDTO dto); + /** * operation */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java index e750196..9a9d239 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.bgt.domain.BgtProjectRecruitApply; import com.ruoyi.bgt.domain.BgtWageApplication; import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO; import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO; +import com.ruoyi.bgt.domain.dto.BgtMessageUnAuditDetailDTO; import com.ruoyi.bgt.domain.vo.BgtMessageCountVO; import com.ruoyi.bgt.domain.vo.BgtMessageDetailVO; import com.ruoyi.bgt.domain.vo.BgtMessageVO; @@ -279,4 +280,74 @@ public class BgtMessageServiceImpl extends ServicePlusImpl unAuditList(BgtMessageUnAuditDetailDTO dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BgtMessage::getRecipientId, SecurityUtils.getAppUserId()); + wrapper.eq(BgtMessage::getMessageLargeType, BGT_LARGE_OTHER); + wrapper.eq(BgtMessage::getSenderId, dto.getUserId()); + wrapper.in(BgtMessage::getMessageSmallType, AUDIT_TYPE); + wrapper.eq(StrUtil.isNotBlank(dto.getMessageSmallType()), BgtMessage::getMessageSmallType, dto.getMessageSmallType()); + wrapper.eq(BgtMessage::getIsOperation,OPERATION_NEED); + if(dto.getDate() != null) { + wrapper.between(BgtMessage::getCreateTime, dto.getDate().atStartOfDay(), dto.getDate().atStartOfDay().with(LocalTime.MAX)); + } + wrapper.orderByDesc(BgtMessage::getCreateTime); + Page result = page(PageUtils.buildPage(), wrapper); + Page bgtMessageVOPage = new Page<>(); + bgtMessageVOPage.setTotal(result.getTotal()); + + ArrayList bgtMessageVOS = new ArrayList<>(); + + for (BgtMessage message : result.getRecords()) { + BgtMessageDetailVO bgtMessageDetailVO = BeanUtil.copyProperties(message, BgtMessageDetailVO.class); + if (BGT_LARGE_TASK.equals(message.getMessageLargeType())) { + FbsProjectTask task = taskService.getById(message.getTableId()); + bgtMessageDetailVO.setTaskName(task.getTaskName()); + } else if (BGT_LARGE_SETTLEMENT.equals(message.getMessageLargeType())) { + BgtWageApplication wageApplication = wageApplicationService.getById(message.getTableId()); + FbsProjectTask task = taskService.getById(wageApplication.getTaskId()); + bgtMessageDetailVO.setTaskName(task.getTaskName()); + } else if (BGT_LARGE_OTHER.equals(message.getMessageLargeType())) { + switch (message.getMessageSmallType()) { + case BGT_SMALL_SIGN_UP: +// BgtProjectRecruitApply recruitApply = recruitApplyService.getById(message.getTableId()); +// BgtProjectRecruit recruit = recruitService.getById(recruitApply.getRecruitId()); +// bgtMessageDetailVO.setRecruitName(recruit.getRecruitName()); + break; + case BGT_SMALL_PAY: +// WgzPayCalculation payCalculation = payCalculationService.getById(message.getTableId()); +// BgtProjectRecruit recruitPay = recruitService.getById(payCalculation.getRecruitId()); +// bgtMessageDetailVO.setRecruitName(recruitPay.getRecruitName()); + break; + case BGT_SMALL_LEAVE: + WgzLeave wgzLeave = leaveService.getById(message.getTableId()); + bgtMessageDetailVO.setReason(wgzLeave.getReason()); + bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(wgzLeave.getUserId()).getUsername()); + bgtMessageDetailVO.setStartTime(wgzLeave.getStartTime()); + bgtMessageDetailVO.setEndTime(wgzLeave.getEndTime()); + break; + case BGT_SMALL_MAKE_UP: + WgzReissueacard reissueCard = reissueacardService.getById(message.getTableId()); + bgtMessageDetailVO.setReason(reissueCard.getReason()); + bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(reissueCard.getUserId()).getUsername()); + bgtMessageDetailVO.setNowTime(reissueCard.getNowTime()); + break; + case BGT_SMALL_REPORT_MAKE_UP: + WgzDailyClock dailyClock = dailyClockService.getById(message.getTableId()); +// BgtProjectRecruit recruitClock = recruitService.getById(dailyClock.getRecruitId()); + bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(dailyClock.getUserId()).getUsername()); +// bgtMessageDetailVO.setRecruitName(recruitClock.getRecruitName()); + break; + default: + break; + } + } + bgtMessageVOS.add(bgtMessageDetailVO); + } + bgtMessageVOPage.setRecords(bgtMessageVOS); + return PageUtils.buildDataInfo(bgtMessageVOPage); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/constants/BgtMessageConstant.java b/ruoyi-system/src/main/java/com/ruoyi/common/constants/BgtMessageConstant.java index 1155848..87c7fd1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/constants/BgtMessageConstant.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/constants/BgtMessageConstant.java @@ -1,6 +1,8 @@ package com.ruoyi.common.constants; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; public class BgtMessageConstant { @@ -16,6 +18,7 @@ public class BgtMessageConstant { public static final String BGT_SMALL_MAKE_UP = "4"; //小类型-补卡 public static final String BGT_SMALL_REPORT_MAKE_UP = "5"; //小类型-日报补卡 + public static final List AUDIT_TYPE = Arrays.asList("2", "3", "4", "5"); /** * ============================================包工头->务工者 模板================================================== * ============================================包工头->务工者 模板================================================== diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java index 6d56261..5008ad7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -60,11 +61,13 @@ public class FbsProjectTask implements Serializable { /** 任务金额 */ @Excel(name = "任务金额") @ApiModelProperty("任务金额") + @Pattern(regexp = "^[0-9]+(\\.[0-9]{1,2})?$",message = "只能两位小数的数字") private BigDecimal taskAmount; /** 用工数量 */ @Excel(name = "用工数量") @ApiModelProperty("用工数量") + @Pattern(regexp = "^[0-9]+$",message = "只能是整数") private Integer taskStaffNum; /** 任务开始时间 */ @@ -83,6 +86,7 @@ public class FbsProjectTask implements Serializable { /** 联系电话 */ @Excel(name = "联系电话") @ApiModelProperty("联系电话") + @Pattern(regexp = "^[0-9]+$",message = "联系电话只能是数字") private String taskContactPhone; /** 分包描述 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java index 118c36f..0a8b47c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java @@ -132,6 +132,11 @@ public interface IWgzAttendanceService extends IServicePlus { */ Integer attendanceDetail(Long userId,Long recruitId, Integer num); + /** + * 务工者个人未结算工资统计 + */ + Integer unFinishCount(Long userId,Long recruitId, Long recruitApplyId); + /** * 务工者个人考勤统计 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java index dadf270..10bb8a4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java @@ -117,7 +117,7 @@ public interface IWgzPayCalculationService extends IServicePlus apply = new LambdaQueryWrapper(). + eq(WgzAttendance::getUserId, userId). + eq(WgzAttendance::getApplyKey, recruitApplyId). + eq(WgzAttendance::getSettlement, 0). //为0就表示当天工资还未结算 + eq(WgzAttendance::getRecruitId, recruitId).and(wrapper -> wrapper + .isNotNull(WgzAttendance::getClockInTime) + .or() + .isNotNull(WgzAttendance::getClockOutTime) + ); + apply.orderByAsc(WgzAttendance::getDate); + return baseMapper.selectCount(apply); + } + + // @Override // public Integer attendanceDetail(Long userId, Long recruitId, Integer num) { // LambdaQueryWrapper apply = new LambdaQueryWrapper(). // eq(WgzAttendance::getUserId, userId). @@ -703,14 +719,15 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl bgtProjectRecruits = iBgtProjectRecruitService.getBaseMapper().selectList(Wrappers.lambdaQuery() - .eq(BgtProjectRecruit::getTaskId, dto.getTaskId())); - List recruitIds = bgtProjectRecruits.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList()); +// List bgtProjectRecruits = iBgtProjectRecruitService.getBaseMapper().selectList(Wrappers.lambdaQuery() +// .eq(BgtProjectRecruit::getTaskId, dto.getTaskId())); +// List recruitIds = bgtProjectRecruits.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList()); //查询该务工者在这个项目里指定月份的所有考勤数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(WgzAttendance::getUserId, dto.getUserId()); - wrapper.in(WgzAttendance::getRecruitId, recruitIds); +// wrapper.in(WgzAttendance::getRecruitId, recruitIds); + wrapper.eq(WgzAttendance::getApplyKey, dto.getRecruitApplyId()); LocalDate date = dto.getDate(); LocalDate startDate = date.with(TemporalAdjusters.firstDayOfMonth()); LocalDate endData = date.with(TemporalAdjusters.lastDayOfMonth()); @@ -719,8 +736,15 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl wgzAttendances = baseMapper.selectList(wrapper); //获取招工打卡时间 - List list = iBgtProjectRecruitService.list(Wrappers.lambdaQuery().in(BgtProjectRecruit::getId,recruitIds)); - Map recruitMap = list.stream().collect(Collectors.toMap(BgtProjectRecruit::getId, recruit -> recruit)); +// List list = iBgtProjectRecruitService.list(Wrappers.lambdaQuery().in(BgtProjectRecruit::getId,recruitIds)); +// Map recruitMap = list.stream().collect(Collectors.toMap(BgtProjectRecruit::getId, recruit -> recruit)); + + BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(dto.getRecruitApplyId()); + BgtProjectRecruit recruit = iBgtProjectRecruitService.getById(recruitApply.getRecruitId()); + //上班时间 + LocalTime beginWorkTime = recruit.getBeginWorkTime(); + //下班时间 + LocalTime endWorkTime = recruit.getEndWorkTime(); // 创建SimpleDateFormat对象，格式化日期为中文星期 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEEE", Locale.CHINA); @@ -734,10 +758,6 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpllambdaQuery() - .eq(BgtProjectRecruitApply::getRecruitId, recruitId).eq(BgtProjectRecruitApply::getUserId, userId) - .orderByDesc(BgtProjectRecruitApply::getId) - .last("limit 1")); - vo.setEntryTime(apply.getEntryTime()); - int i = iWgzAttendanceService.count( new LambdaQueryWrapper(). eq(WgzAttendance::getUserId, userId). + eq(WgzAttendance::getApplyKey,recruitApplyId). eq(WgzAttendance::getRecruitId,recruitId).and(wrapper -> wrapper .isNotNull(WgzAttendance::getClockInTime) .or() @@ -515,7 +516,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl0); return vo; } @@ -525,6 +526,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(WgzPayCalculation::getUserId, dto.getUserId()) .eq(WgzPayCalculation::getRecruitId, dto.getRecruitId()) + .eq(WgzPayCalculation::getApplyKey, dto.getRecruitApplyId()) .eq(WgzPayCalculation::getAuditorUserId, SecurityUtils.getAppUserId()) .in(WgzPayCalculation::getAuditorType,AuditStatus.getAudit()) .orderByDesc(WgzPayCalculation::getCreateTime); @@ -546,6 +548,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl payList = list(Wrappers.lambdaQuery().eq(WgzPayCalculation::getAuditorType, AuditStatus.UNREAD.getCode()) + .eq(WgzPayCalculation::getRecruitId, dto.getRecruitId()) + .eq(WgzPayCalculation::getApplyKey, dto.getRecruitApplyId()) .eq(WgzPayCalculation::getUserId, dto.getUserId())); if(CollectionUtil.isNotEmpty(payList)) { payList.forEach(pay -> { @@ -587,10 +592,17 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl