feat:领取人模糊搜索

This commit is contained in:
dzc committed 2025-09-21 13:41:35 +08:00
1 parent cb0ecba9a7
commit a143db7cd1
2 files changed
+8

No files matched your search

@@ -44,6 +44,12 @@ public class ActCancelItemEntity extends Model<ActCancelItemEntity> {
@Schema(description = "领取人用户id")
private Long receiverUserId;
/**
* 领取人用户名
*/
@Schema(description = "领取人用户名")
private String receiverUserName;
/**
* 领取时间
*/
@@ -55,6 +55,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
Page<ActCancelItemVo> pageList = baseMapper.selectPage(page, new LambdaQueryWrapper<ActCancelItemEntity>()
.eq(ObjectUtil.isNotEmpty(dto.getMchId()), ActCancelItemEntity::getMchId, dto.getMchId())
.eq(ObjectUtil.isNotEmpty(dto.getReceiverUserId()), ActCancelItemEntity::getReceiverUserId, dto.getReceiverUserId())
.like(ObjectUtil.isNotEmpty(dto.getReceiverUserName()), ActCancelItemEntity::getReceiverUserName, dto.getReceiverUserName())
.eq(ObjectUtil.isNotEmpty(dto.getCancelUserId()), ActCancelItemEntity::getCancelUserId, dto.getCancelUserId())
.eq(ObjectUtil.isNotEmpty(dto.getActStatus()), ActCancelItemEntity::getActStatus, dto.getActStatus())
.orderByDesc(ActCancelItemEntity::getReceiverTime)
@@ -141,6 +142,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
saveObj.setActId(-1L);
saveObj.setMchId(actMch.getId());
saveObj.setReceiverUserId(user.getId());
saveObj.setReceiverUserName(user.getUsername());
saveObj.setReceiverTime(now);
saveObj.setActStatus(ActCancelStatusEnum.CANCEL_AWAIT.getCode());
saveObj.setExpireTime(expireTime);