用户列表展示注册时间和迁移时间 并可排序

src/main/java/com/peanut/modules/book/controller/MyUserController.java

@@ -101,6 +101,21 @@ public class MyUserController {
                 wrapper.eq(UserVip::getState,0);
             }
         }
+        wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId);
+        wrapper.selectAll(MyUserEntity.class);
+        wrapper.selectAs(UserMigration::getCreateTime,"migrationTime");
+
+        wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId);
+        wrapper.selectAll(MyUserEntity.class);
+        wrapper.selectAs(UserMigration::getCreateTime,"migrationTime");
+        boolean isAsc = p.getSortValue().equals("")?false:(p.getSortValue().equals("ascending")?true:true);
+        String sortKey = p.getSortKey().equals("")?"createTime":p.getSortKey();
+        if(sortKey.equals("migrationTime")){
+            wrapper.orderBy(true, isAsc, UserMigration::getCreateTime);
+        }else{
+            wrapper.orderBy(true, isAsc, MyUserEntity::getCreateTime);
+        }
+
         wrapper.orderByDesc(MyUserEntity::getCreateTime);
         Page<MyUserEntity> myUserEntityPage = userService.getBaseMapper().selectPage(new Page<MyUserEntity>(p.getPage(), p.getLimit()), wrapper);
         for (MyUserEntity myUserEntity : myUserEntityPage.getRecords()) {

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;
 }

src/main/java/com/peanut/modules/common/entity/MyUserEntity.java

@@ -165,5 +165,7 @@ public class MyUserEntity implements Serializable {
 	private List<UserEbookVip> userEbookVip;
 	@TableField(exist = false)
 	private String contributionScore;
+	@TableField(exist = false)
+	private String migrationTime;
 
 }