From 7364aa36b9821fe0b3cff996e9975e23ddb4ccc5 Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Sat, 9 May 2026 16:40:47 +0800 Subject: [PATCH] =?UTF-8?q?2=20=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/MyUserController.java | 16 ++++++++++++- .../book/service/UserMigrationService.java | 7 ++++++ .../impl/UserMigrationServiceImpl.java | 9 +++++++ .../com/peanut/modules/book/to/PageIdDto.java | 4 ++++ .../modules/common/dao/UserMigrationDao.java | 19 +++++++++++++++ .../modules/common/entity/MyUserEntity.java | 2 ++ .../modules/common/entity/UserMigration.java | 24 +++++++++++++++++++ 7 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/peanut/modules/book/service/UserMigrationService.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/UserMigrationServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/common/dao/UserMigrationDao.java create mode 100644 src/main/java/com/peanut/modules/common/entity/UserMigration.java diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index 6093c71..110209e 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -101,7 +101,21 @@ public class MyUserController { wrapper.eq(UserVip::getState,0); } } - wrapper.orderByDesc(MyUserEntity::getCreateTime); + wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId); + wrapper.selectAll(MyUserEntity.class); + wrapper.selectAs(UserMigration::getCreateTime,"migrationTime"); + if(p.getSortKey().equals("")||(p.getSortKey().equals("createTime") && p.getSortValue().equals("descending"))){ + wrapper.orderByDesc(MyUserEntity::getCreateTime); + }else if (p.getSortKey().equals("createTime") && p.getSortValue().equals("ascending")){ + wrapper.orderByAsc(MyUserEntity::getCreateTime); + }else if (p.getSortKey().equals("migrationTime") && p.getSortValue().equals("ascending")){ + wrapper.orderByAsc(UserMigration::getCreateTime); + }else if (p.getSortKey().equals("migrationTime") && p.getSortValue().equals("descending")){ + wrapper.orderByDesc(UserMigration::getCreateTime); + }else{ + wrapper.orderByDesc(MyUserEntity::getCreateTime); + } + Page myUserEntityPage = userService.getBaseMapper().selectPage(new Page(p.getPage(), p.getLimit()), wrapper); for (MyUserEntity myUserEntity : myUserEntityPage.getRecords()) { myUserEntity.setUserVips(userVipService.list(new LambdaQueryWrapper() diff --git a/src/main/java/com/peanut/modules/book/service/UserMigrationService.java b/src/main/java/com/peanut/modules/book/service/UserMigrationService.java new file mode 100644 index 0000000..f52572b --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/UserMigrationService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.book.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.UserMigration; + +public interface UserMigrationService extends IService { +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/UserMigrationServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/UserMigrationServiceImpl.java new file mode 100644 index 0000000..9154baa --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/UserMigrationServiceImpl.java @@ -0,0 +1,9 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.book.service.UserMigrationService; +import com.peanut.modules.common.dao.UserMigrationDao; +import com.peanut.modules.common.entity.UserMigration; + +public class UserMigrationServiceImpl extends ServiceImpl implements UserMigrationService { +} diff --git a/src/main/java/com/peanut/modules/book/to/PageIdDto.java b/src/main/java/com/peanut/modules/book/to/PageIdDto.java index bb31be0..fcc829b 100644 --- a/src/main/java/com/peanut/modules/book/to/PageIdDto.java +++ b/src/main/java/com/peanut/modules/book/to/PageIdDto.java @@ -16,4 +16,8 @@ public class PageIdDto implements Serializable { private Integer limit; private Integer page; + + private String sortKey; + + private String sortValue; } diff --git a/src/main/java/com/peanut/modules/common/dao/UserMigrationDao.java b/src/main/java/com/peanut/modules/common/dao/UserMigrationDao.java new file mode 100644 index 0000000..0d9bdcc --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/UserMigrationDao.java @@ -0,0 +1,19 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.MyUserEntity; +import com.peanut.modules.common.entity.UserMigration; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author yl + * @email yl328572838@163.com + * @date 2022-08-10 14:20:12 + */ +@Mapper +public interface UserMigrationDao extends BaseMapper { + + +} diff --git a/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java b/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java index cd6b669..ac9a769 100644 --- a/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/MyUserEntity.java @@ -158,5 +158,7 @@ public class MyUserEntity implements Serializable { private List userVips; @TableField(exist = false) private String contributionScore; + @TableField(exist = false) + private String migrationTime; } diff --git a/src/main/java/com/peanut/modules/common/entity/UserMigration.java b/src/main/java/com/peanut/modules/common/entity/UserMigration.java new file mode 100644 index 0000000..0cbca74 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/UserMigration.java @@ -0,0 +1,24 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("user_migration") +public class UserMigration { + @TableId + private Integer id; + private Integer userId; + private Integer wumenUserId; + private Integer newWumenUserId; + private String type; + private Date createTime; + @TableLogic + private Integer delFlag; + + +}