wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

邮箱服务

main
王宇航 2024-05-29 20:08:32 +08:00
parent c70366de48
commit 2d297c356c
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml
View File

@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAppExchangeCodeList" parameterType="AppExchangeCode" resultMap="AppExchangeCodeResult">
<include refid="selectAppExchangeCodeVo"/>
u.username
left join sys_user u on u.user_id = app_exchange_code.user_id
<where>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="updateBy != null and updateBy != ''"> and updateBy = #{updateBy}</if>
<if test="userTime != null "> and user_time = #{userTime}</if>
<if test="userTime != null "> and DATE_FORMAT(user_time,'%Y-%m-%d') = DATE_FORMAT(#{userTime},'%Y-%m-%d') </if>
</where>
</select>

2
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
View File

@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="selectAppUserVo">
select id, username, password, nickname, email, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member,job_end_time,
select id, username, password, nickname, email,sex, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member,job_end_time,
order_id, order_start_time, order_end_time , `check` , back_ground_img from app_user
</sql>

19
gan-ui/src/views/app/vip/gener/index.vue
View File

@ -1,14 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="兑换码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入兑换码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="使用者" prop="userId">
<el-input
v-model="queryParams.userId"
@ -17,14 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新人" prop="updateBy">
<el-input
v-model="queryParams.updateBy"
placeholder="请输入更新人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="使用时间" prop="userTime">
<el-date-picker clearable
v-model="queryParams.userTime"
@ -133,9 +117,6 @@
<el-form-item label="使用者" prop="userId">
<el-input v-model="form.userId" placeholder="请输入使用者" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="使用时间" prop="userTime">
<el-date-picker clearable
v-model="form.userTime"