diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/recent/vo/OperationPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/recent/vo/OperationPageReqVO.java index f96e4d0..f08b2f3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/recent/vo/OperationPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/recent/vo/OperationPageReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.member.controller.admin.recent.vo; import cn.iocoder.yudao.module.member.enums.MemberRecentOperateEnum; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; @@ -22,6 +23,15 @@ public class OperationPageReqVO extends PageParam { @Schema(description = "用户编号") private Long memberId; + @Schema(description = "用户昵称") + private String memberNickname; + + @Schema(description = "操作用户编号") + private Long operatorMemberId; + + @Schema(description = "操作用户昵称") + private String operatorMemberNickname; + @Schema(description = "朋友圈编号") private Long memberRecentId; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/recent/OperationMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/recent/OperationMapper.java index fd8e4f4..b14847c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/recent/OperationMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/recent/OperationMapper.java @@ -31,8 +31,10 @@ public interface OperationMapper extends BaseMapperX { .selectAs("operator_member", MemberUserDO::getNickname, OperationRespVO::getOperatorMemberNickname) .leftJoin(MemberUserDO.class, "member", MemberUserDO::getId, OperationDO::getMemberId) .leftJoin(MemberUserDO.class, "operator_member", MemberUserDO::getId, OperationDO::getOperatorMemberId) - .eqIfExists(OperationDO::getMemberId, reqVO.getMemberId()) + .likeIfExists("member", MemberUserDO::getNickname, reqVO.getMemberNickname()) + .likeIfExists("operator_member", MemberUserDO::getNickname, reqVO.getOperatorMemberNickname()) .eqIfExists(OperationDO::getMemberRecentId, reqVO.getMemberRecentId()) + .eqIfExists(OperationDO::getMemberId, reqVO.getMemberId()) .eqIfExists(OperationDO::getBizType, reqVO.getBizType()) .eqIfExists(OperationDO::getReportType, reqVO.getReportType()); if (ObjectUtil.isNotEmpty(reqVO.getCreateTime())) { diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationService.java index 53be2fd..adc0dbf 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationService.java @@ -16,39 +16,26 @@ public interface OperationService { /** * 创建朋友圈操作 - * - * @param createReqVO 创建信息 - * @return 编号 */ Long createOperation(@Valid OperationSaveReqVO createReqVO); /** * 更新朋友圈操作 - * - * @param updateReqVO 更新信息 */ void updateOperation(@Valid OperationSaveReqVO updateReqVO); /** * 删除朋友圈操作 - * - * @param id 编号 */ void deleteOperation(Long id); /** * 获得朋友圈操作 - * - * @param id 编号 - * @return 朋友圈操作 */ OperationDO getOperation(Long id); /** * 获得朋友圈操作分页 - * - * @param pageReqVO 分页查询 - * @return 朋友圈操作分页 */ PageResult getOperationPage(OperationPageReqVO pageReqVO);