init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserStatusController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.UserStatus;
+import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
 import com.ruoyi.xq.service.UserStatusService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -40,8 +41,8 @@ public class UserStatusController extends BaseController {
      */
     @SaCheckPermission("xq:userStatus:list")
     @GetMapping("/list")
-    public TableDataInfo<UserStatus> list(UserStatus bo, PageQuery pageQuery) {
+    public TableDataInfo<UserStatusAdminVo> list(UserStatusAdminVo bo, PageQuery pageQuery) {
-        Page<UserStatus> page = userStatusService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserStatusAdminVo> page = userStatusService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/userstatus/UserStatusAdminVo.java

@@ -0,0 +1,15 @@
+package com.ruoyi.xq.dto.admin.userstatus;
+
+import com.ruoyi.xq.domain.UserStatus;
+import lombok.Data;
+
+@Data
+public class UserStatusAdminVo extends UserStatus {
+    /**
+     * 昵称
+     */
+    private String nickname;
+    private String mobile;
+
+    private String avatar;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserStatusMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.xq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.xq.domain.UserStatus;
+import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户状态Mapper接口
@@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.UserStatus;
  */
 public interface UserStatusMapper extends BaseMapper<UserStatus> {
 
+    Page<UserStatusAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserStatusAdminVo bo);
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.xq.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.xq.domain.UserStatus;
+import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
 import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
 
 /**
@@ -15,4 +18,6 @@ public interface UserStatusService extends IService<UserStatus> {
     UserStatus getByUserId(Long userId);
 
     void updateStatus(UserStatusUpdateAppReq req);
+
+    Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo);
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ruoyi.xq.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.xq.domain.UserStatus;
 import com.ruoyi.xq.domain.UserVip;
+import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
 import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
 import com.ruoyi.xq.enums.ErrorEnum;
 import com.ruoyi.xq.enums.userstatus.PersonalsStatusEnum;
@@ -56,4 +59,9 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
         }
         this.updateById(update);
     }
+
+    @Override
+    public Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo) {
+        return baseMapper.pageAdmin(pageQuery.build(),bo);
+    }
 }

ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t1.nickname,t1.type,t1.mobile,t1.avatar,t1.gender,t1.age,t1.birthday,
         t1.height,t1.weight,t1.somatotype,t1.zodiac,t1.sign,t1.residence_name,t1.address_name,t1.residence_city_name,
         t1.education,t1.marriage,t1.profession,t1.annual_income,t1.company_nature,t1.for_personals,
-        t1.remark,t1.status,t1.finish_base_status11
+        t1.remark,t1.status,t1.finish_base_status
         from xq_user t1
         join xq_user_info t2 on t1.id = t2.user_id
         <where>

ruoyi-xq/src/main/resources/mapper/xq/UserStatusMapper.xml

@@ -3,19 +3,23 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.xq.mapper.UserStatusMapper">
-
+    <select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo">
-    <resultMap type="com.ruoyi.xq.domain.UserStatus" id="UserStatusResult">
+        select t1.*, t2.nickname, t2.mobile,t2.avatar
-        <result property="id" column="id"/>
+        from xq_user_status t1
-        <result property="userId" column="user_id"/>
+        left join xq_user t2 on t1.user_id = t2.id
-        <result property="usercode" column="usercode"/>
+        <where>
-        <result property="personalsStatus" column="personals_status"/>
+            <if test="bo.usercode != null and bo.usercode != ''">
-        <result property="showAvatar" column="show_avatar"/>
+                and t1.usercode = #{bo.usercode}
-        <result property="showInfo" column="show_info"/>
+            </if>
-        <result property="allowTransMobile" column="allow_trans_mobile"/>
+            <if test="bo.nickname != null and bo.nickname != ''">
-        <result property="allowTransWx" column="allow_trans_wx"/>
+                and t2.nickname like concat('%',#{bo.nickname},'%')
-        <result property="createTime" column="create_time"/>
+            </if>
-        <result property="updateTime" column="update_time"/>
+            <if test="bo.mobile != null and bo.mobile != ''">
-    </resultMap>
+                and t2.mobile = #{bo.mobile}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 
 
 </mapper>