注册申请查询、导出修改

user_center/src/main/java/com/huaxu/controller/UserRegisterController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.common.EasyExcelUtil;
 import com.huaxu.dto.OperateLogDto;
+import com.huaxu.dto.QueryCondition;
 import com.huaxu.entity.UserRegister;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.Pagination;
@@ -12,10 +13,13 @@ import com.huaxu.service.UserRegisterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 
@@ -73,23 +77,27 @@ public class UserRegisterController {
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询用户注册申请列表")
-    public AjaxMessage<Pagination<UserRegister>> selectPage(@ApiParam(value = "页数", required = true) @RequestParam Integer pageNum,
-                                                            @ApiParam(value = "条数", required = true) @RequestParam Integer pageSize,
-                                                            @ApiParam(value = "查询关键字", required = false)@RequestParam(required = false) String keyWords) {
+    public AjaxMessage<Pagination<UserRegister>> selectPage(@ApiParam(value = "查询条件", required = true) @RequestBody QueryCondition queryCondition) throws ParseException {
         UserRegister userRegister = new UserRegister();
-        userRegister.setUsername(keyWords);
-        userRegister.setPhone(keyWords);
-        IPage<UserRegister> iPage = new Page<>(pageNum, pageSize);
-        iPage = userRegisterService.selectPage(userRegister, iPage);
+        userRegister.setUsername(queryCondition.getKeywords());
+        SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd");
+        if(StringUtils.isNotBlank(queryCondition.getBeginTime())){
+            userRegister.setDateCreate(sdf_day.parse(queryCondition.getBeginTime()));
+        }
+        if(StringUtils.isNotBlank(queryCondition.getEndTime())){
+            userRegister.setDateUpdate(sdf_day.parse(queryCondition.getEndTime()));
+        }
+        IPage<UserRegister> iPage = new Page<>(queryCondition.getPageNum(), queryCondition.getPageSize());
+        iPage = userRegisterService.selectPage (userRegister, iPage);
         Pagination<UserRegister> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
    @RequestMapping(value = "/exportExcel", method = RequestMethod.POST)
     @ApiOperation(value = "注册申请列表导出")
-    public AjaxMessage<String> exportExcel(@ApiParam(value = "注册ids", required = true) @RequestBody Long[] ids) {
-        List<UserRegister> result = userRegisterService.selectListByIds(ids);
-        String filePath = EasyExcelUtil.excelWrite(baseDir, UserRegister.class, "注册申请列表", result);
+    public AjaxMessage<String> exportExcel(@ApiParam(value = "查询条件", required = true) @RequestBody QueryCondition queryCondition) {
+        List<UserRegister> result = userRegisterService.selectListByCondition(queryCondition);
+        String filePath = EasyExcelUtil.excelWrite(baseDir, UserRegister.class, "用户注册申请记录", result);
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }
 

user_center/src/main/java/com/huaxu/dao/UserRegisterMapper.java

@@ -2,6 +2,7 @@ package com.huaxu.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dto.OperateLogDto;
+import com.huaxu.dto.QueryCondition;
 import com.huaxu.entity.Dict;
 import com.huaxu.entity.UserRegister;
 import com.huaxu.model.AjaxMessage;
@@ -52,9 +53,9 @@ public interface UserRegisterMapper {
     /**
      * 通过ids条件查询
      *
-     * @param ids 实例对象
+     * @param queryCondition 实例对象
      * @return 对象列表
      */
-    List<UserRegister> selectListByIds(@Param("ids") Long[] ids);
+    List<UserRegister> selectListByCondition(QueryCondition queryCondition);
 
 }

user_center/src/main/java/com/huaxu/dto/QueryCondition.java

@@ -0,0 +1,32 @@
+package com.huaxu.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("查询条件")
+public class QueryCondition {
+    @ApiModelProperty(value = "主键数组")
+    Long[] ids;
+
+    @ApiModelProperty(value = "关键字")
+    private String keywords;
+
+    @ApiModelProperty(value = "起始时间 yyyy-MM-dd" )
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间 yyyy-MM-dd")
+    private String endTime;
+
+    @ApiModelProperty(value ="页数")
+    private Integer pageNum;
+
+    @ApiModelProperty(value ="条数")
+    private Integer pageSize;
+
+}

user_center/src/main/java/com/huaxu/entity/Dict.java

@@ -1,5 +1,6 @@
 package com.huaxu.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,6 +66,7 @@ public class Dict implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date dateCreate;
     /**
@@ -75,6 +77,7 @@ public class Dict implements Serializable {
     /**
     * 更新时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "更新时间")
     private Date dateUpdate;
 }

user_center/src/main/java/com/huaxu/entity/UserRegister.java

@@ -79,6 +79,7 @@ public class UserRegister implements Serializable {
     * 更新时间
     */
     @ExcelIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "更新时间")
     private Date dateUpdate;
 }

user_center/src/main/java/com/huaxu/service/UserRegisterService.java

@@ -2,6 +2,7 @@ package com.huaxu.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dto.OperateLogDto;
+import com.huaxu.dto.QueryCondition;
 import com.huaxu.entity.UserRegister;
 
 import java.util.List;
@@ -38,9 +39,10 @@ public interface UserRegisterService {
      * @return 对象列表
      */
     IPage<UserRegister> selectPage(UserRegister userRegister, IPage<UserRegister> page);
+
     /**
-     * 通过ids条件查询
+     * 通过条件查询
      * @return 对象列表
      */
-    List<UserRegister> selectListByIds(Long[] ids);
+    List<UserRegister> selectListByCondition(QueryCondition queryCondition);
 }

user_center/src/main/java/com/huaxu/service/impl/UserRegisterServiceImpl.java

@@ -3,6 +3,7 @@ package com.huaxu.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.UserRegisterMapper;
 import com.huaxu.dto.OperateLogDto;
+import com.huaxu.dto.QueryCondition;
 import com.huaxu.entity.Dict;
 import com.huaxu.entity.UserRegister;
 import com.huaxu.service.UserRegisterService;
@@ -55,12 +56,12 @@ public class UserRegisterServiceImpl implements UserRegisterService {
         return this.userRegisterMapper.selectPage(page, userRegister);
     }
     /**
-     * 根据ids条件查询
+     * 根据条件查询
      *
      * @return 实例对象的集合
      */
     @Override
-    public List<UserRegister> selectListByIds(Long[] ids) {
-        return userRegisterMapper.selectListByIds(ids);
+    public List<UserRegister> selectListByCondition(QueryCondition queryCondition) {
+        return userRegisterMapper.selectListByCondition(queryCondition);
     }
 }

user_center/src/main/resources/mapper/DictMapper.xml

@@ -60,6 +60,7 @@
             </if>
             and STATUS =1
         </where>
+        order by DICT_NAME,DICT_VALUE
     </select>
 
     <!-- 新增所有列 -->
@@ -172,7 +173,7 @@
                 and PARENT_DICT_ID IS NULL
             </if>
             and STATUS =1
-            order by DATE_CREATE desc
         </where>
+        order by DICT_NAME,DICT_VALUE
     </select>
 </mapper>

user_center/src/main/resources/mapper/UserRegisterMapper.xml

@@ -44,24 +44,42 @@
             </if>
             <if test="userRegister.username != null and userRegister.username != ''">
                 and (USERNAME LIKE CONCAT('%',#{userRegister.username},'%')
+                or PHONE LIKE CONCAT('%',#{userRegister.username},'%'))
             </if>
-            <if test="userRegister.phone != null and userRegister.phone != ''">
-                or PHONE LIKE CONCAT('%',#{userRegister.phone},'%'))
+            <if test="userRegister.dateCreate != null">
+                and DATE_CREATE >= #{userRegister.dateCreate}
+            </if>
+            <if test="userRegister.dateUpdate != null">
+                and DATE_CREATE &lt; DATE_ADD(#{userRegister.dateUpdate},INTERVAL 1 DAY)
             </if>
             and STATUS =1
         </where>
+        order by DATE_CREATE desc
     </select>
-    <select id="selectListByIds" resultMap="UserRegisterMap">
+    <select id="selectListByCondition" resultMap="UserRegisterMap">
         select
         <include refid="Base_Column_List"/>
         from uims_user_register
         <where>
-            ID in
-            <foreach item="item" index="index" collection="ids" open="("
-                     separator="," close=")">
-                #{item}
-            </foreach>
+            <if test="ids != null">
+                ID in
+                <foreach item="item" index="index" collection="ids" open="("
+                         separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="keywords != null and keywords != '' ">
+                and (USERNAME LIKE CONCAT('%',#{keywords},'%')
+                or PHONE LIKE CONCAT('%',#{keywords},'%'))
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and DATE_CREATE >= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != '' ">
+                and DATE_CREATE &lt; DATE_ADD(#{endTime},INTERVAL 1 DAY)
+            </if>
             and STATUS =1
         </where>
+        order by DATE_CREATE desc
     </select>
 </mapper>