From f3e48f62ea4437c650450b149f4e5547112a8c91 Mon Sep 17 00:00:00 2001 From: zhengzheng <18918765049@163.com> Date: Sun, 20 Mar 2022 11:18:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/ActiveUserController.java | 218 +++++------------- .../templates/active/user/index.html | 100 ++++++++ .../resources/templates/index-topnav.html | 2 +- .../src/main/resources/templates/index.html | 2 +- .../system/domain/EnrollActiveUser.java | 140 +++++++++++ .../system/mapper/ActiveUserMapper.java | 24 ++ .../system/mapper/EnrollUserMapper.java | 64 ----- .../system/service/IActiveUserService.java | 83 +------ .../service/impl/ActiveUserServiceImpl.java | 33 +++ .../mapper/system/ActiveUserMapper.xml | 40 ++++ 10 files changed, 405 insertions(+), 301 deletions(-) create mode 100644 zt-admin/src/main/resources/templates/active/user/index.html create mode 100644 zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java create mode 100644 zt-system/src/main/java/com/wuzhen/system/mapper/ActiveUserMapper.java create mode 100644 zt-system/src/main/java/com/wuzhen/system/service/impl/ActiveUserServiceImpl.java create mode 100644 zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml diff --git a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveUserController.java b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveUserController.java index 6488cca0f..594a6dadf 100644 --- a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveUserController.java +++ b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveUserController.java @@ -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 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 list = postService.selectPostList(post); -// ExcelUtil util = new ExcelUtil(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 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 list = iActiveUserService.selectActiveUserList(enrollActiveUser); + ExcelUtil util = new ExcelUtil(EnrollActiveUser.class); + return util.exportExcel(list, "报名用户活动数据"); + } + +} diff --git a/zt-admin/src/main/resources/templates/active/user/index.html b/zt-admin/src/main/resources/templates/active/user/index.html new file mode 100644 index 000000000..26023fb66 --- /dev/null +++ b/zt-admin/src/main/resources/templates/active/user/index.html @@ -0,0 +1,100 @@ + + + + + + +
+
+
+
+
+
    +
  • + 报名用户编号： +
    • +
  • + 活动标题： +
    • + +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/zt-admin/src/main/resources/templates/index-topnav.html b/zt-admin/src/main/resources/templates/index-topnav.html index 8a176457d..3670a18f2 100644 --- a/zt-admin/src/main/resources/templates/index-topnav.html +++ b/zt-admin/src/main/resources/templates/index-topnav.html @@ -303,7 +303,7 @@
-
© [[${copyrightYear}]] RuoYi Copyright
+
© [[${copyrightYear}]] Wuzhen Copyright
diff --git a/zt-admin/src/main/resources/templates/index.html b/zt-admin/src/main/resources/templates/index.html index f77f0f2b3..2423a8c3a 100644 --- a/zt-admin/src/main/resources/templates/index.html +++ b/zt-admin/src/main/resources/templates/index.html @@ -250,7 +250,7 @@
-
© [[${copyrightYear}]] RuoYi Copyright
+
© [[${copyrightYear}]] Wuzhen Copyright
diff --git a/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java new file mode 100644 index 000000000..597fdb157 --- /dev/null +++ b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java @@ -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(); + } + +} diff --git a/zt-system/src/main/java/com/wuzhen/system/mapper/ActiveUserMapper.java b/zt-system/src/main/java/com/wuzhen/system/mapper/ActiveUserMapper.java new file mode 100644 index 000000000..d9af5bbe7 --- /dev/null +++ b/zt-system/src/main/java/com/wuzhen/system/mapper/ActiveUserMapper.java @@ -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 selectActiveUserList(EnrollActiveUser enrollActiveUser); + + +} diff --git a/zt-system/src/main/java/com/wuzhen/system/mapper/EnrollUserMapper.java b/zt-system/src/main/java/com/wuzhen/system/mapper/EnrollUserMapper.java index 10042b5dd..44a6fcd24 100644 --- a/zt-system/src/main/java/com/wuzhen/system/mapper/EnrollUserMapper.java +++ b/zt-system/src/main/java/com/wuzhen/system/mapper/EnrollUserMapper.java @@ -21,68 +21,4 @@ public interface EnrollUserMapper public List selectEnrollUserList(EnrollUser enrollUser); - - -// /** -// * 查询所有岗位 -// * -// * @return 岗位列表 -// */ -// public List selectPostAll(); -// -// /** -// * 根据用户ID查询岗位 -// * -// * @param userId 用户ID -// * @return 岗位列表 -// */ -// public List 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); } diff --git a/zt-system/src/main/java/com/wuzhen/system/service/IActiveUserService.java b/zt-system/src/main/java/com/wuzhen/system/service/IActiveUserService.java index 56e6c7288..7973fc6e6 100644 --- a/zt-system/src/main/java/com/wuzhen/system/service/IActiveUserService.java +++ b/zt-system/src/main/java/com/wuzhen/system/service/IActiveUserService.java @@ -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 selectPostList(SysPost post); + public List selectActiveUserList(EnrollActiveUser enrollActiveUser); - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(); + - /** - * 根据用户ID查询岗位 - * - * @param userId 用户ID - * @return 岗位列表 - */ - public List 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); } diff --git a/zt-system/src/main/java/com/wuzhen/system/service/impl/ActiveUserServiceImpl.java b/zt-system/src/main/java/com/wuzhen/system/service/impl/ActiveUserServiceImpl.java new file mode 100644 index 000000000..9b3d273b6 --- /dev/null +++ b/zt-system/src/main/java/com/wuzhen/system/service/impl/ActiveUserServiceImpl.java @@ -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 selectActiveUserList(EnrollActiveUser enrollActiveUser) { + return activeUserMapper.selectActiveUserList(enrollActiveUser); + } + +} diff --git a/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml new file mode 100644 index 000000000..825c196bf --- /dev/null +++ b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + \ No newline at end of file