ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
zhengzheng 2022-04-12 16:46:13 +08:00
parent 0c41b8fb51
commit 0d3b23f98f
6 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zt-admin/src/main/resources/templates/active/user/index.html
View File

@ -11,7 +11,7 @@
<div class="select-list">
<ul>
<li>
报名用户编号：<input type="text" name="enrollUserNo"/>
报名用户编号：<input type="text" name="id"/>
</li>
<li>
活动标题：<input type="text" name="activeTitle"/>
@ -46,13 +46,13 @@
var options = {
url: prefix + "/list",
exportUrl: prefix + "/export",
sortName: "enrollUserNo",
sortName: "id",
modalName: "职务",
columns: [{
checkbox: true
},
{
field: 'enrollUserNo',
field: 'id',
title: '报名用户编号'
},
{

6
zt-admin/src/main/resources/templates/enroll/user/index.html
View File

@ -11,7 +11,7 @@
<div class="select-list">
<ul>
<li>
报名用户编号：<input type="text" name="enrollUserNo"/>
报名用户编号：<input type="text" name="id"/>
</li>
<li>
职务：<input type="text" name="postName"/>
@ -46,13 +46,13 @@
var options = {
url: prefix + "/list",
exportUrl: prefix + "/export",
sortName: "enrollUserNo",
sortName: "id",
modalName: "职务",
columns: [{
checkbox: true
},
{
field: 'enrollUserNo',
field: 'id',
title: '报名用户编号'
},
{

18
zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java
View File

@ -14,11 +14,19 @@ import org.apache.commons.lang3.builder.ToStringStyle;
public class EnrollActiveUser extends BaseEntity {
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
/**
* 报名用户编号
*/
@Excel(name = "报名用户编号", cellType = ColumnType.NUMERIC)
private Long enrollUserNo;
private Long id;
/**
@ -62,13 +70,7 @@ public class EnrollActiveUser extends BaseEntity {
public Long getEnrollUserNo() {
return enrollUserNo;
}
public void setEnrollUserNo(Long enrollUserNo) {
this.enrollUserNo = enrollUserNo;
}
public String getNickName() {
return nickName;
@ -123,7 +125,7 @@ public class EnrollActiveUser extends BaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("enrollUserNo", getEnrollUserNo())
.append("id", getId())
.append("nickName", getNickName())
.append("postName", getPostName())
.append("phoneNumber", getPhoneNumber())

25
zt-system/src/main/java/com/wuzhen/system/domain/EnrollUser.java
View File

@ -14,11 +14,19 @@ import org.apache.commons.lang3.builder.ToStringStyle;
public class EnrollUser extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 报名用户编号
*/
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
// /**
// * 报名用户编号
// */
@Excel(name = "报名用户编号", cellType = ColumnType.NUMERIC)
private Long enrollUserNo;
private Long id;
/**
@ -53,13 +61,6 @@ public class EnrollUser extends BaseEntity {
private String recommenderNo;
public Long getEnrollUserNo() {
return enrollUserNo;
}
public void setEnrollUserNo(Long enrollUserNo) {
this.enrollUserNo = enrollUserNo;
}
public String getNickName() {
return nickName;
@ -105,7 +106,7 @@ public class EnrollUser extends BaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("enrollUserNo", getEnrollUserNo())
.append("id", getId())
.append("nickName", getNickName())
.append("postName", getPostName())
.append("phoneNumber", getPhoneNumber())

8
zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.wuzhen.system.mapper.ActiveUserMapper">
<resultMap type="EnrollActiveUser" id="EnrollActiveUserResult">
<id property="enrollUserNo" column="enroll_user_no"/>
<id property="id" column="id"/>
<result property="nickName" column="nick_name"/>
<result property="postName" column="post_name"/>
<result property="phoneNumber" column="phone_number"/>
@ -20,7 +20,7 @@
</resultMap>
<sql id="selectActiveUserVo">
select e.enroll_user_no, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title
select e.id, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title
from enroll_user e inner join active_info a ON e.active_no = a.id
</sql>
@ -28,8 +28,8 @@
<select id="selectActiveUserList" parameterType="EnrollActiveUser" resultMap="EnrollActiveUserResult">
<include refid="selectActiveUserVo"/>
<where>
<if test="enrollUserNo != null and enrollUserNo != ''">
AND e.enroll_user_no like concat('%', #{enrollUserNo}, '%')
<if test="id != null and id != ''">
AND e.id like concat('%', #{id}, '%')
</if>
<if test="activeTitle != null and activeTitle != ''">
AND a.active_title like concat('%', #{activeTitle}, '%')

8
zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.wuzhen.system.mapper.EnrollUserMapper">
<resultMap type="EnrollUser" id="EnrollUserResult">
<id property="enrollUserNo" column="enroll_user_no"/>
<id property="id" column="id"/>
<result property="nickName" column="nick_name"/>
<result property="postName" column="post_name"/>
<result property="phoneNumber" column="phone_number"/>
@ -19,7 +19,7 @@
</resultMap>
<sql id="selectUserVo">
select enroll_user_no, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark
select id, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark
from enroll_user
</sql>
@ -27,8 +27,8 @@
<select id="selectEnrollUserList" parameterType="EnrollUser" resultMap="EnrollUserResult">
<include refid="selectUserVo"/>
<where>
<if test="enrollUserNo != null and enrollUserNo != ''">
AND enroll_user_no like concat('%', #{enrollUserNo}, '%')
<if test="id != null and id != ''">
AND id like concat('%', #{id}, '%')
</if>
<if test="postName != null and postName != ''">
AND post_name like concat('%', #{postName}, '%')