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

代码提交

This commit is contained in:
zhengzheng 2022-03-20 11:18:02 +08:00
parent 3688132b04
commit f3e48f62ea
10 changed files with 405 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveUserController.java
View File

@ -1,160 +1,58 @@
package com.wuzhen.web.controller.busi;//package com.wuzhen.web.controller.system;
//
//import com.wuzhen.common.annotation.Log;
//import com.wuzhen.common.constant.UserConstants;
//import com.wuzhen.common.core.controller.BaseController;
//import com.wuzhen.common.core.domain.AjaxResult;
//import com.wuzhen.common.core.page.TableDataInfo;
//import com.wuzhen.common.enums.BusinessType;
//import com.wuzhen.common.utils.poi.ExcelUtil;
//import com.wuzhen.system.domain.SysPost;
//import com.wuzhen.system.service.ISysPostService;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.ModelMap;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//
///**
// * 岗位信息操作处理
// *
// * @author zhengzheng
// */
//@Controller
//@RequestMapping("/system/post")
//public class ActiveUserController extends BaseController
//{
// private String prefix = "system/post";
//
// @Autowired
// private ISysPostService postService;
//
// @RequiresPermissions("system:post:view")
// @GetMapping()
// public String operlog()
// {
// return prefix + "/post";
// }
//
// @RequiresPermissions("system:post:list")
// @PostMapping("/list")
// @ResponseBody
// public TableDataInfo list(SysPost post)
// {
// startPage();
// List<SysPost> list = postService.selectPostList(post);
// return getDataTable(list);
// }
//
// @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
// @RequiresPermissions("system:post:export")
// @PostMapping("/export")
//// @ResponseBody
// public AjaxResult export(SysPost post)
// {
// List<SysPost> list = postService.selectPostList(post);
// ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
// return util.exportExcel(list, "岗位数据");
// }
//
// @RequiresPermissions("system:post:remove")
// @Log(title = "岗位管理", businessType = BusinessType.DELETE)
// @PostMapping("/remove")
// @ResponseBody
// public AjaxResult remove(String ids)
// {
// try
// {
// return toAjax(postService.deletePostByIds(ids));
// }
// catch (Exception e)
// {
// return error(e.getMessage());
// }
// }
//
// /**
// * 新增岗位
// */
// @GetMapping("/add")
// public String add()
// {
// return prefix + "/add";
// }
//
// /**
// * 新增保存岗位
// */
// @RequiresPermissions("system:post:add")
// @Log(title = "岗位管理", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// @ResponseBody
// public AjaxResult addSave(@Validated SysPost post)
// {
// if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
// {
// return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
// }
// else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
// {
// return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
// }
// post.setCreateBy(getLoginName());
// return toAjax(postService.insertPost(post));
// }
//
// /**
// * 修改岗位
// */
// @RequiresPermissions("system:post:edit")
// @GetMapping("/edit/{postId}")
// public String edit(@PathVariable("postId") Long postId, ModelMap mmap)
// {
// mmap.put("post", postService.selectPostById(postId));
// return prefix + "/edit";
// }
//
// /**
// * 修改保存岗位
// */
// @RequiresPermissions("system:post:edit")
// @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
// @PostMapping("/edit")
// @ResponseBody
// public AjaxResult editSave(@Validated SysPost post)
// {
// if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
// {
// return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
// }
// else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
// {
// return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
// }
// post.setUpdateBy(getLoginName());
// return toAjax(postService.updatePost(post));
// }
//
// /**
// * 校验岗位名称
// */
// @PostMapping("/checkPostNameUnique")
// @ResponseBody
// public String checkPostNameUnique(SysPost post)
// {
// return postService.checkPostNameUnique(post);
// }
//
// /**
// * 校验岗位编码
// */
// @PostMapping("/checkPostCodeUnique")
// @ResponseBody
// public String checkPostCodeUnique(SysPost post)
// {
// return postService.checkPostCodeUnique(post);
// }
//}
package com.wuzhen.web.controller.busi;
import com.wuzhen.common.annotation.Log;
import com.wuzhen.common.core.controller.BaseController;
import com.wuzhen.common.core.domain.AjaxResult;
import com.wuzhen.common.core.page.TableDataInfo;
import com.wuzhen.common.enums.BusinessType;
import com.wuzhen.common.utils.poi.ExcelUtil;
import com.wuzhen.system.domain.EnrollActiveUser;
import com.wuzhen.system.service.IActiveUserService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* 报名用户查询
*
* @author zhengzheng
*/
@Controller
@RequestMapping("/active/user")
public class ActiveUserController extends BaseController {
private String prefix = "active/user";
@Autowired
private IActiveUserService iActiveUserService;
@RequiresPermissions("active:user:view")
@GetMapping()
public String operlog() {
return prefix + "/index";
}
@RequiresPermissions("active:user:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(EnrollActiveUser enrollActiveUser) {
startPage();
List<EnrollActiveUser> list = iActiveUserService.selectActiveUserList(enrollActiveUser);
return getDataTable(list);
}
@Log(title = "用户活动导出管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("active:user:export")
@PostMapping("/export")
@ResponseBody
public AjaxResult export(EnrollActiveUser enrollActiveUser) {
List<EnrollActiveUser> list = iActiveUserService.selectActiveUserList(enrollActiveUser);
ExcelUtil<EnrollActiveUser> util = new ExcelUtil<EnrollActiveUser>(EnrollActiveUser.class);
return util.exportExcel(list, "报名用户活动数据");
}
}

100
zt-admin/src/main/resources/templates/active/user/index.html Normal file
View File

@ -0,0 +1,100 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('报名活动列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="post-form">
<div class="select-list">
<ul>
<li>
报名用户编号：<input type="text" name="enrollUserNo"/>
</li>
<li>
活动标题：<input type="text" name="activeTitle"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="active:user:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "active/user";
$(function() {
var options = {
url: prefix + "/list",
exportUrl: prefix + "/export",
sortName: "enrollUserNo",
modalName: "职务",
columns: [{
checkbox: true
},
{
field: 'enrollUserNo',
title: '报名用户编号'
},
{
field: 'nickName',
title: '昵称',
sortable: true
},
{
field: 'postName',
title: '职务',
sortable: true
},
{
field: 'activeTitle',
title: '活动标题',
sortable: true
},
{
field: 'phoneNumber',
title: '手机号码',
sortable: true
},
{
field: 'playbillAddress',
title: '海报地址',
sortable: true
},
{
field: 'recommenderNo',
title: '推荐人编号',
sortable: true
},
{
field: 'createTime',
title: '报名时间',
sortable: true
}
]
};
$.table.init(options);
});
</script>
</body>
</html>

2
zt-admin/src/main/resources/templates/index-topnav.html
View File

@ -303,7 +303,7 @@
</div>
<div th:if="${footer}" class="footer">
<div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
<div class="pull-right">© [[${copyrightYear}]] Wuzhen Copyright </div>
</div>
</div>
<!--右侧部分结束-->

2
zt-admin/src/main/resources/templates/index.html
View File

@ -250,7 +250,7 @@
</div>
<div th:if="${footer}" class="footer">
<div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
<div class="pull-right">© [[${copyrightYear}]] Wuzhen Copyright </div>
</div>
</div>
<!--右侧部分结束-->

140
zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java Normal file
View File

@ -0,0 +1,140 @@
package com.wuzhen.system.domain;
import com.wuzhen.common.annotation.Excel;
import com.wuzhen.common.annotation.Excel.ColumnType;
import com.wuzhen.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 报名表 EnrollActiveUser
*
* @author zhengzheng
*/
public class EnrollActiveUser extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 报名用户编号
*/
@Excel(name = "报名用户编号", cellType = ColumnType.NUMERIC)
private Long enrollUserNo;
/**
* 昵称
*/
@Excel(name = "昵称")
private String nickName;
/**
* 岗位名称
*/
@Excel(name = "职务")
private String postName;
/**
* 手机号码
*/
@Excel(name = "手机号码")
private String phoneNumber;
/**
* 海报地址
*/
@Excel(name = "海报地址")
private String playbillAddress;
/**
* 推荐人编号
*/
@Excel(name = "推荐人编号")
private String recommenderNo;
/**
* 活动标题
*/
@Excel(name = "活动标题")
private String activeTitle;
public Long getEnrollUserNo() {
return enrollUserNo;
}
public void setEnrollUserNo(Long enrollUserNo) {
this.enrollUserNo = enrollUserNo;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
public String getPlaybillAddress() {
return playbillAddress;
}
public void setPlaybillAddress(String playbillAddress) {
this.playbillAddress = playbillAddress;
}
public String getRecommenderNo() {
return recommenderNo;
}
public void setRecommenderNo(String recommenderNo) {
this.recommenderNo = recommenderNo;
}
public String getPostName() {
return postName;
}
public void setPostName(String postName) {
this.postName = postName;
}
public String getActiveTitle() {
return activeTitle;
}
public void setActiveTitle(String activeTitle) {
this.activeTitle = activeTitle;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("enrollUserNo", getEnrollUserNo())
.append("nickName", getNickName())
.append("postName", getPostName())
.append("phoneNumber", getPhoneNumber())
.append("playbillAddress", getPlaybillAddress())
.append("recommenderNo", getRecommenderNo())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

24
zt-system/src/main/java/com/wuzhen/system/mapper/ActiveUserMapper.java Normal file
View File

@ -0,0 +1,24 @@
package com.wuzhen.system.mapper;
import com.wuzhen.system.domain.EnrollActiveUser;
import com.wuzhen.system.domain.EnrollUser;
import java.util.List;
/**
* 报名用户信息 数据层
*
* @author zhengzheng
*/
public interface ActiveUserMapper
{
/**
* 报名用户数据集合
*
* @param enrollActiveUser 报名用户信息
* @return 报名用户集合
*/
public List<EnrollActiveUser> selectActiveUserList(EnrollActiveUser enrollActiveUser);
}

64
zt-system/src/main/java/com/wuzhen/system/mapper/EnrollUserMapper.java
View File

@ -21,68 +21,4 @@ public interface EnrollUserMapper
public List<EnrollUser> selectEnrollUserList(EnrollUser enrollUser);
// /**
// * 查询所有岗位
// *
// * @return 岗位列表
// */
// public List<SysPost> selectPostAll();
//
// /**
// * 根据用户ID查询岗位
// *
// * @param userId 用户ID
// * @return 岗位列表
// */
// public List<SysPost> selectPostsByUserId(Long userId);
//
// /**
// * 通过岗位ID查询岗位信息
// *
// * @param postId 岗位ID
// * @return 角色对象信息
// */
// public SysPost selectPostById(Long postId);
//
// /**
// * 批量删除岗位信息
// *
// * @param ids 需要删除的数据ID
// * @return 结果
// */
// public int deletePostByIds(Long[] ids);
//
// /**
// * 修改岗位信息
// *
// * @param post 岗位信息
// * @return 结果
// */
// public int updatePost(SysPost post);
//
// /**
// * 新增岗位信息
// *
// * @param post 岗位信息
// * @return 结果
// */
// public int insertPost(SysPost post);
//
// /**
// * 校验岗位名称
// *
// * @param postName 岗位名称
// * @return 结果
// */
// public SysPost checkPostNameUnique(String postName);
//
// /**
// * 校验岗位编码
// *
// * @param postCode 岗位编码
// * @return 结果
// */
// public SysPost checkPostCodeUnique(String postCode);
}

83
zt-system/src/main/java/com/wuzhen/system/service/IActiveUserService.java
View File

@ -1,92 +1,25 @@
package com.wuzhen.system.service;
import com.wuzhen.system.domain.SysPost;
import com.wuzhen.system.domain.EnrollActiveUser;
import com.wuzhen.system.domain.EnrollUser;
import java.util.List;
/**
* 岗位信息 服务层
* 报名用户服务 服务层
*
* @author zhengzheng
*/
public interface IActiveUserService
{
/**
* 查询岗位信息集合
* 查询报名用户活动
*
* @param post 岗位信息
* @return 岗位信息集合
* @param enrollActiveUser 报名信息表
* @return 报名信息集合
*/
public List<SysPost> selectPostList(SysPost post);
public List<EnrollActiveUser> selectActiveUserList(EnrollActiveUser enrollActiveUser);
/**
* 查询所有岗位
*
* @return 岗位列表
*/
public List<SysPost> selectPostAll();
/**
* 根据用户ID查询岗位
*
* @param userId 用户ID
* @return 岗位列表
*/
public List<SysPost> selectPostsByUserId(Long userId);
/**
* 通过岗位ID查询岗位信息
*
* @param postId 岗位ID
* @return 角色对象信息
*/
public SysPost selectPostById(Long postId);
/**
* 批量删除岗位信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deletePostByIds(String ids);
/**
* 新增保存岗位信息
*
* @param post 岗位信息
* @return 结果
*/
public int insertPost(SysPost post);
/**
* 修改保存岗位信息
*
* @param post 岗位信息
* @return 结果
*/
public int updatePost(SysPost post);
/**
* 通过岗位ID查询岗位使用数量
*
* @param postId 岗位ID
* @return 结果
*/
public int countUserPostById(Long postId);
/**
* 校验岗位名称
*
* @param post 岗位信息
* @return 结果
*/
public String checkPostNameUnique(SysPost post);
/**
* 校验岗位编码
*
* @param post 岗位信息
* @return 结果
*/
public String checkPostCodeUnique(SysPost post);
}

33
zt-system/src/main/java/com/wuzhen/system/service/impl/ActiveUserServiceImpl.java Normal file
View File

@ -0,0 +1,33 @@
package com.wuzhen.system.service.impl;
import com.wuzhen.system.domain.EnrollActiveUser;
import com.wuzhen.system.domain.EnrollUser;
import com.wuzhen.system.mapper.ActiveUserMapper;
import com.wuzhen.system.mapper.EnrollUserMapper;
import com.wuzhen.system.service.IActiveUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 岗位信息 服务层处理
*
* @author zhengzheng
*/
@Service
public class ActiveUserServiceImpl implements IActiveUserService {
@Autowired
private ActiveUserMapper activeUserMapper;
/**
* 查询报名用户信息集合
*
* @param enrollActiveUser 报名信息
* @return 报名信息集合
*/
@Override
public List<EnrollActiveUser> selectActiveUserList(EnrollActiveUser enrollActiveUser) {
return activeUserMapper.selectActiveUserList(enrollActiveUser);
}
}

40
zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wuzhen.system.mapper.ActiveUserMapper">
<resultMap type="EnrollActiveUser" id="EnrollActiveUserResult">
<id property="enrollUserNo" column="enroll_user_no"/>
<result property="nickName" column="nick_name"/>
<result property="postName" column="post_name"/>
<result property="phoneNumber" column="phone_number"/>
<result property="playbillAddress" column="playbill_address"/>
<result property="recommenderNo" column="recommender_no"/>
<result property="activeTitle" column="active_title"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</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
from enroll_user e inner join active_info a ON e.active_no = a.id
</sql>
<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>
<if test="activeTitle != null and activeTitle != ''">
AND a.active_title like concat('%', #{activeTitle}, '%')
</if>
</where>
</select>
</mapper>