Browse Source

用户审核findlist重写

ZhangWenQiang 6 năm trước cách đây
mục cha
commit
5c802018c7

+ 28 - 0
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/controller/UserController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hpposition.entity.Position;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.service.IUserService;
 import org.jeecg.modules.user.service.IUserService;
 
 
@@ -78,6 +79,33 @@ public class UserController {
     }
     }
 
 
     /**
     /**
+     * 重写分页
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "用户审核-分页列表查询")
+    @ApiOperation(value = "用户审核-分页列表查询", notes = "用户审核-分页列表查询")
+    @GetMapping(value = "/list_new")
+    public Result<Page<User>> queryPageListNew(User user,
+                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest req) {
+        Result<Page<User>> result = new Result<Page<User>>();
+        Page<User> pageList = new Page<User>(pageNo,pageSize);
+        pageList = userService.queryPageListNew(pageList,user);//通知公告消息
+        log.info("查询当前页:"+pageList.getCurrent());
+        log.info("查询当前页数量:"+pageList.getSize());
+        log.info("查询结果数量:"+pageList.getRecords().size());
+        log.info("数据总数:"+pageList.getTotal());
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
      * 添加
      * 添加
      *
      *
      * @param user
      * @param user

+ 2 - 0
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/mapper/UserMapper.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.user.mapper;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
  */
 public interface UserMapper extends BaseMapper<User> {
 public interface UserMapper extends BaseMapper<User> {
 
 
+    Page<User> queryPageListNew(Page<User> page, @Param("user") User user);
 }
 }

+ 42 - 0
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/mapper/xml/UserMapper.xml

@@ -2,4 +2,46 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.user.mapper.UserMapper">
 <mapper namespace="org.jeecg.modules.user.mapper.UserMapper">
 
 
+    <sql id="userColumns">
+        a.id AS "id",
+		a.phone AS "phone",
+		a.gender AS "gender",
+		a.head_img_url AS "headImgUrl",
+		a.client_id AS "clientId",
+		a.user_token AS "userToken",
+		a.real_name as "realName",
+		a.id_card_number AS "idCardNumber",
+		a.id_card_front AS "idCardFront",
+		a.id_card_back AS "idCardBack",
+		a.position AS "position",
+		a.user_type AS "userType",
+		a.authentication_status AS "authenticationStatus",
+		a.create_time AS "createTime",
+		a.update_time AS "updateTime",
+		a.login_time as "loginTime",
+		a.del_flag as "delFlag"
+    </sql>
+
+    <sql id="userJoins">
+
+    </sql>
+
+    <select id="queryPageListNew" resultType="org.jeecg.modules.user.entity.User">
+        SELECT
+        <include refid="userColumns"/>
+        FROM dp_user a
+        <include refid="userJoins"/>
+        <where>
+            1=1
+            <if test="user.realName != null and user.realName != ''">
+                and a.real_name LIKE  concat('%',#{user.realName},'%')
+            </if>
+            <if test="user.userType != null ">
+                AND a.user_type = #{user.userType}
+            </if>
+            <if test="user.authenticationStatus != null ">
+                AND a.authentication_status = #{user.authenticationStatus}
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>

+ 2 - 0
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/service/IUserService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.user.service;
 package org.jeecg.modules.user.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
  */
 public interface IUserService extends IService<User> {
 public interface IUserService extends IService<User> {
 
 
+    Page<User> queryPageListNew(Page<User> pageList, User user);
 }
 }

+ 10 - 0
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/service/impl/UserServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.user.service.impl;
 package org.jeecg.modules.user.service.impl;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.hpposition.mapper.PositionMapper;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.mapper.UserMapper;
 import org.jeecg.modules.user.mapper.UserMapper;
 import org.jeecg.modules.user.service.IUserService;
 import org.jeecg.modules.user.service.IUserService;
@@ -7,6 +9,8 @@ import org.springframework.stereotype.Service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 
+import javax.annotation.Resource;
+
 /**
 /**
  * @Description: 用户审核
  * @Description: 用户审核
  * @Author: jeecg-boot
  * @Author: jeecg-boot
@@ -15,5 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
  */
 @Service
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
+    @Resource
+    private UserMapper userMapper;
 
 
+    @Override
+    public Page<User> queryPageListNew(Page<User> page, User user) {
+        return userMapper.queryPageListNew(page,user);
+    }
 }
 }