创客信息管理预设职级列表查询

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserAdvancePageDTO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/userAdvance/SysUserAdvancePageDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.user.api.dto.admin.user;
+package com.kxs.user.api.dto.admin.userAdvance;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/userLevel/SysUserLevelPageDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.user.api.dto.admin.userLevel;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 预设职级-列表-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+public class SysUserLevelPageDTO {
+
+    /**
+     * 创客编码
+     */
+    @Schema(description = "创客编码")
+    private String userCode;
+
+
+    /**
+     * 结束时间区间['','']
+     */
+    @Schema(description = "结束时间区间['','']")
+    private Object endTime;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserWithdrawalPageDTO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/userWithdrawal/SysUserWithdrawalPageDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.user.api.dto.admin.user;
+package com.kxs.user.api.dto.admin.userWithdrawal;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserAdvancePageVO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/userAdvance/SysUserAdvancePageVO.java

@@ -1,4 +1,4 @@
-package com.kxs.user.api.vo.admin.user;
+package com.kxs.user.api.vo.admin.userAdvance;
 
 
 import com.kxs.user.api.model.KxsUserAdvance;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/userLevel/SysUserLevelPageVO.java

@@ -0,0 +1,47 @@
+package com.kxs.user.api.vo.admin.userLevel;
+
+
+import com.kxs.user.api.model.KxsUserLevelLog;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 预设职级-列表vo
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+@Schema(description = "预设职级-列表返回实体")
+public class SysUserLevelPageVO extends KxsUserLevelLog implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+
+    /**
+     * 创客编码
+     */
+    @Schema(description = "创客编码")
+    private Object userCode;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object username;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserWithdrawalPageVO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/userWithdrawal/SysUserWithdrawalPageVO.java

@@ -1,4 +1,4 @@
-package com.kxs.user.api.vo.admin.user;
+package com.kxs.user.api.vo.admin.userWithdrawal;
 
 
 import com.kxs.user.api.model.KxsUserWithdrawal;

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserAdvanceController.java

@@ -2,8 +2,8 @@ package com.kxs.user.biz.controller.admin;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
-import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
-import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+import com.kxs.user.api.dto.admin.userAdvance.SysUserAdvancePageDTO;
+import com.kxs.user.api.vo.admin.userAdvance.SysUserAdvancePageVO;
 import com.kxs.user.biz.service.KxsUserAdvanceService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserLevelController.java

@@ -0,0 +1,49 @@
+package com.kxs.user.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.userLevel.SysUserLevelPageDTO;
+import com.kxs.user.api.vo.admin.userLevel.SysUserLevelPageVO;
+import com.kxs.user.biz.service.KxsUserLevelLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 创客信息管理(SysUserLevel)控制层
+ *
+ * @author 系统
+ * @since 2024-06-24 09:30:02
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysUserLevel")
+public class SysUserLevelController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsUserLevelLogService kxsUserLevelLogService;
+
+
+
+    /**
+     * 预设职级-列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 预设职级-列表
+     */
+    @GetMapping("/page")
+    public R userLevelPage(Page<SysUserLevelPageVO> page, SysUserLevelPageDTO param) {
+        kxsUserLevelLogService.userLevelPage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserWithdrawalController.java

@@ -2,8 +2,8 @@ package com.kxs.user.biz.controller.admin;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
-import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
-import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
+import com.kxs.user.api.dto.admin.userWithdrawal.SysUserWithdrawalPageDTO;
+import com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO;
 import com.kxs.user.biz.service.KxsUserWithdrawalService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserAdvanceMapper.java

@@ -1,11 +1,10 @@
 package com.kxs.user.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
+import com.kxs.user.api.dto.admin.userAdvance.SysUserAdvancePageDTO;
 import com.kxs.user.api.model.KxsUserAdvance;
-import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+import com.kxs.user.api.vo.admin.userAdvance.SysUserAdvancePageVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserLevelLogMapper.java

@@ -1,8 +1,16 @@
 package com.kxs.user.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.user.api.dto.admin.userLevel.SysUserLevelPageDTO;
+import com.kxs.user.api.dto.admin.userWithdrawal.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.model.KxsUserLevelLog;
+import com.kxs.user.api.vo.admin.userLevel.SysUserLevelPageVO;
+import com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户预设职级日志表(KxsUserLevelLog)表数据库访问层
@@ -13,5 +21,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsUserLevelLogMapper extends BaseMapper<KxsUserLevelLog> {
 
+
+    /**
+     * 分页查询预设职级列表
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserLevelPageVO> userLevelPage (Page page, @Param("query") SysUserLevelPageDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserWithdrawalMapper.java

@@ -3,10 +3,9 @@ package com.kxs.user.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
-import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
+import com.kxs.user.api.dto.admin.userWithdrawal.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.model.KxsUserWithdrawal;
-import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
+import com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserAdvanceService.java

@@ -1,12 +1,11 @@
 package com.kxs.user.biz.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
-import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
+import com.kxs.user.api.dto.admin.userAdvance.SysUserAdvancePageDTO;
 import com.kxs.user.api.model.KxsUserAdvance;
-import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+import com.kxs.user.api.vo.admin.userAdvance.SysUserAdvancePageVO;
 
 import java.util.List;
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserLevelLogService.java

@@ -1,7 +1,12 @@
 package com.kxs.user.biz.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.dto.admin.userLevel.SysUserLevelPageDTO;
 import com.kxs.user.api.model.KxsUserLevelLog;
+import com.kxs.user.api.vo.admin.userLevel.SysUserLevelPageVO;
+
+import java.util.List;
 
 /**
  * 用户预设职级日志表(KxsUserLevelLog)表服务接口
@@ -11,5 +16,13 @@ import com.kxs.user.api.model.KxsUserLevelLog;
  */
 public interface KxsUserLevelLogService extends IService<KxsUserLevelLog> {
 
+
+    /**
+     * 预设职级管理列表查询
+     * @param page
+     * @param pageDTO
+     * @return
+     */
+    List<SysUserLevelPageVO> userLevelPage(Page page, SysUserLevelPageDTO pageDTO);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserWithdrawalService.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
-import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
+import com.kxs.user.api.dto.admin.userWithdrawal.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.dto.kxsapp.userAccount.WithdrawDepositDTO;
 import com.kxs.user.api.model.KxsUserWithdrawal;
-import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
+import com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawDetailVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAdvanceServiceImpl.java

@@ -1,29 +1,23 @@
 package com.kxs.user.biz.service.impl;
 
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.kxs.common.core.constant.enums.AmountLogChangeTypesEnum;
 import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.common.core.util.R;
-import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
-import com.kxs.user.api.model.KxsUserAmount;
+import com.kxs.user.api.dto.admin.userAdvance.SysUserAdvancePageDTO;
 import com.kxs.common.core.constant.enums.UserAdvanceStatusEnum;
 import com.kxs.user.api.model.KxsUserAmountLog;
-import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+import com.kxs.user.api.vo.admin.userAdvance.SysUserAdvancePageVO;
 import com.kxs.user.biz.mapper.KxsUserAdvanceMapper;
 import com.kxs.user.api.model.KxsUserAdvance;
 import com.kxs.user.biz.mapper.KxsUserAmountMapper;
 import com.kxs.user.biz.service.KxsUserAdvanceService;
-import com.kxs.user.biz.service.KxsUserAmountLogService;
 import com.kxs.user.biz.service.KxsUserAmountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserLevelLogServiceImpl.java

@@ -1,11 +1,16 @@
 package com.kxs.user.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.user.api.dto.admin.userLevel.SysUserLevelPageDTO;
+import com.kxs.user.api.vo.admin.userLevel.SysUserLevelPageVO;
 import com.kxs.user.biz.mapper.KxsUserLevelLogMapper;
 import com.kxs.user.api.model.KxsUserLevelLog;
 import com.kxs.user.biz.service.KxsUserLevelLogService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 用户预设职级日志表(KxsUserLevelLog)表服务实现类
  *
@@ -15,5 +20,13 @@ import org.springframework.stereotype.Service;
 @Service("kxsUserLevelLogService")
 public class KxsUserLevelLogServiceImpl extends ServiceImpl<KxsUserLevelLogMapper, KxsUserLevelLog> implements KxsUserLevelLogService {
 
+    @Override
+    public List<SysUserLevelPageVO> userLevelPage(Page page, SysUserLevelPageDTO pageDTO) {
+        List<SysUserLevelPageVO> list = baseMapper.userLevelPage(page, pageDTO);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserWithdrawalServiceImpl.java

@@ -1,6 +1,5 @@
 package com.kxs.user.biz.service.impl;
 
-import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.IdUtil;
@@ -12,11 +11,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
-import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
+import com.kxs.user.api.dto.admin.userWithdrawal.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.dto.kxsapp.userAccount.WithdrawDepositDTO;
 import com.kxs.user.api.model.KxsUserAmount;
 import com.kxs.user.api.model.KxsUserBank;
-import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
+import com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawDetailVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 import com.kxs.user.biz.constant.enums.UserErrorTypeEnum;

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserAdvanceMapper.xml

@@ -19,7 +19,7 @@
 
     </resultMap>
 
-    <resultMap id="WebKxsUserAdvanceMap" type="com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO" extends="KxsUserAdvanceMap">
+    <resultMap id="WebKxsUserAdvanceMap" type="com.kxs.user.api.vo.admin.userAdvance.SysUserAdvancePageVO" extends="KxsUserAdvanceMap">
         <result column="user_code" property="userCode" />
         <result column="username" property="username" />
         <result column="phone" property="phone" />

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserLevelLogMapper.xml

@@ -16,5 +16,25 @@
         <result column="remark" property="remark" />
 
     </resultMap>
+    <resultMap id="WebKxsUserLevelLogMap" type="com.kxs.user.api.vo.admin.userLevel.SysUserLevelPageVO" extends="KxsUserLevelLogMap">
+        <result column="user_code" property="userCode" />
+        <result column="username" property="username" />
+    </resultMap>
 
+    <select id="userLevelPage" resultMap="WebKxsUserLevelLogMap">
+        SELECT
+            kull.*,
+            ku.username,
+            ku.user_code
+        FROM
+            kxs_user_level_log kull
+            LEFT JOIN kxs_user ku ON kull.user_id = ku.id
+        <where>
+            and kull.del_flag = 0
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+    </select>
 </mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserWithdrawalMapper.xml

@@ -25,7 +25,7 @@
 
     </resultMap>
 
-    <resultMap id="WebKxsUserWithdrawalMap" extends="KxsUserWithdrawalMap" type="com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO">
+    <resultMap id="WebKxsUserWithdrawalMap" extends="KxsUserWithdrawalMap" type="com.kxs.user.api.vo.admin.userWithdrawal.SysUserWithdrawalPageVO">
         <result column="user_code" property="userCode" />
         <result column="username" property="username" />
         <result column="id_card" property="idCard" />