From fbd33edd18698cc558cf1d4f04e73d65ed7e5d88 Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 18 Mar 2025 11:28:42 +0800 Subject: [PATCH 1/2] 1 --- .../controller/MemberApplyController.java | 91 ++++++++----------- .../member/mapper/MemberApplyMapper.java | 24 ++++- .../member/service/IMemberApplyService.java | 19 +++- .../service/impl/MemberApplyServiceImpl.java | 17 ++++ .../com/ruoyi/member/vo/MemberApplyVO.java | 14 +++ .../mapper/member/MemberApplyMapper.xml | 11 +++ 6 files changed, 113 insertions(+), 63 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberApplyVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java index d7c2d89..1f1b500 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java @@ -1,50 +1,51 @@ package com.ruoyi.member.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.member.domain.MemberApply; import com.ruoyi.member.service.IMemberApplyService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.member.vo.MemberApplyVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 通告主认证申请Controller - * + * * @author pqz * @date 2025-03-17 */ @RestController @RequestMapping("/member/apply") -public class MemberApplyController extends BaseController -{ +public class MemberApplyController extends BaseController { @Autowired private IMemberApplyService memberApplyService; /** - * 查询通告主认证申请列表 - */ + * 通告主认证申请列表查询 + * + * @param memberApply {@link MemberApplyVO} + * @param pageNum 分页参数 + * @param pageSize 分页参数 + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 9:50 2025/3/18 + **/ @PreAuthorize("@ss.hasPermi('member:apply:list')") @GetMapping("/list") - public AjaxResult list(MemberApply memberApply) - { - - List list = memberApplyService.list(); + public AjaxResult list(MemberApplyVO memberApply, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage list = memberApplyService.queryListPage(memberApply, page); return success(list); } @@ -54,33 +55,27 @@ public class MemberApplyController extends BaseController @PreAuthorize("@ss.hasPermi('member:apply:export')") @Log(title = "通告主认证申请", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, MemberApply memberApply) - { + public void export(HttpServletResponse response, MemberApply memberApply) { List list = memberApplyService.list(); ExcelUtil util = new ExcelUtil(MemberApply.class); util.exportExcel(response, list, "通告主认证申请数据"); } /** - * 获取通告主认证申请详细信息 - */ + * 获取通告主认证详细信息 + * + * @param id 通告主认证表id + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 9:57 2025/3/18 + **/ @PreAuthorize("@ss.hasPermi('member:apply:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return success(memberApplyService.getById(id)); } - /** - * 新增通告主认证申请 - */ - @PreAuthorize("@ss.hasPermi('member:apply:add')") - @Log(title = "通告主认证申请", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody MemberApply memberApply) - { - return toAjax(memberApplyService.save(memberApply)); - } + /** * 修改通告主认证申请 @@ -88,20 +83,8 @@ public class MemberApplyController extends BaseController @PreAuthorize("@ss.hasPermi('member:apply:edit')") @Log(title = "通告主认证申请", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody MemberApply memberApply) - { + public AjaxResult edit(@RequestBody MemberApply memberApply) { return toAjax(memberApplyService.updateById(memberApply)); } - /** - * 删除通告主认证申请 - */ - @PreAuthorize("@ss.hasPermi('member:apply:remove')") - @Log(title = "通告主认证申请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { - List list = new ArrayList<>(Arrays.asList(ids)); - return toAjax(memberApplyService.removeByIds(list)); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberApplyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberApplyMapper.java index 5d732d7..a240bc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberApplyMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberApplyMapper.java @@ -1,18 +1,32 @@ package com.ruoyi.member.mapper; -import java.util.List; -import com.ruoyi.member.domain.MemberApply; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.member.domain.MemberApply; +import com.ruoyi.member.vo.MemberApplyVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 通告主认证申请Mapper接口 - * + * * @author pqz * @date 2025-03-17 */ @Mapper -public interface MemberApplyMapper extends BaseMapper -{ +public interface MemberApplyMapper extends BaseMapper { + + + /** + * 分页查询认证信息 + * + * @param entity {@link MemberApplyVO} + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 9:54 2025/3/18 + **/ + IPage queryListPage(@Param("entity") MemberApplyVO entity, Page page); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java index fda3f6a..4f521b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java @@ -1,16 +1,27 @@ package com.ruoyi.member.service; -import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.member.domain.MemberApply; +import com.ruoyi.member.vo.MemberApplyVO; /** * 通告主认证申请Service接口 - * + * * @author pqz * @date 2025-03-17 */ -public interface IMemberApplyService extends IService -{ +public interface IMemberApplyService extends IService { + /** + * 通告主认证申请列表查询 + * + * @param memberApply {@link MemberApplyVO} + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 9:53 2025/3/18 + **/ + IPage queryListPage(MemberApplyVO memberApply, Page page); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java index e90747c..794b9fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java @@ -1,7 +1,11 @@ package com.ruoyi.member.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.member.vo.MemberApplyVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,4 +26,17 @@ public class MemberApplyServiceImpl extends ServiceImpl + * @author PQZ + * @date 9:53 2025/3/18 + **/ + @Override + public IPage queryListPage(MemberApplyVO memberApply, Page page) { + return memberApplyMapper.queryListPage(memberApply,page); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberApplyVO.java b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberApplyVO.java new file mode 100644 index 0000000..69d2870 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberApplyVO.java @@ -0,0 +1,14 @@ +package com.ruoyi.member.vo; + +import com.ruoyi.member.domain.MemberApply; +import lombok.Data; + +import java.util.Date; + +@Data +public class MemberApplyVO extends MemberApply { + /**申请时间段起*/ + Date startTime; + /**申请时间段止*/ + Date endTime; +} diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml index 0d7b26d..98bd46f 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml @@ -26,6 +26,17 @@ select id, user_id, nickname, identity_type, content, remark, images, approval_status, approval_user_id, approval_time, approval_remark, creator, create_time, updater, update_time, del_flag from dl_member_apply + \ No newline at end of file From 2bd6eb1a457eae1513f314ed446d74d23dc1d8cf Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 18 Mar 2025 14:38:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E5=91=8A=E4=B8=BB=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberApplyController.java | 15 ++++++++----- .../member/service/IMemberApplyService.java | 9 ++++++++ .../service/impl/MemberApplyServiceImpl.java | 21 +++++++++++++++++++ .../mapper/member/MemberApplyMapper.xml | 4 +++- .../common/core/domain/DlBaseEntity.java | 4 ---- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java index 1f1b500..5666d9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java @@ -76,15 +76,20 @@ public class MemberApplyController extends BaseController { } - /** - * 修改通告主认证申请 - */ + * 审核通告主信息 + * + * @param memberApply {@link MemberApplyVO} + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 11:47 2025/3/18 + **/ @PreAuthorize("@ss.hasPermi('member:apply:edit')") @Log(title = "通告主认证申请", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody MemberApply memberApply) { - return toAjax(memberApplyService.updateById(memberApply)); + public AjaxResult edit(@RequestBody MemberApplyVO memberApply) { + memberApplyService.checkMemberApply(memberApply); + return toAjax(true); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java index 4f521b8..3d654e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java @@ -24,4 +24,13 @@ public interface IMemberApplyService extends IService { * @date 9:53 2025/3/18 **/ IPage queryListPage(MemberApplyVO memberApply, Page page); + + /** + * 审核通告主 + * + * @param memberApply {@link MemberApplyVO} + * @author PQZ + * @date 11:50 2025/3/18 + **/ + void checkMemberApply(MemberApplyVO memberApply); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java index 794b9fd..10df5a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java @@ -1,10 +1,12 @@ package com.ruoyi.member.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.vo.MemberApplyVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,4 +41,23 @@ public class MemberApplyServiceImpl extends ServiceImpl queryListPage(MemberApplyVO memberApply, Page page) { return memberApplyMapper.queryListPage(memberApply,page); } + + /** + * 审核通告主 + * + * @param memberApply {@link MemberApplyVO} + * @author PQZ + * @date 11:50 2025/3/18 + **/ + @Override + public void checkMemberApply(MemberApplyVO memberApply) { + //获取当前登录用户id + Long userId = SecurityUtils.getUserId(); + //当前时间 + Date nowDate = new Date(); + memberApply.setApprovalUserId(userId); + memberApply.setApprovalTime(nowDate); + updateById(memberApply); + //// TODO: 2025/3/18 审核成功之后更新会员表状态 + } } diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml index 98bd46f..c876421 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml @@ -32,9 +32,11 @@ del_flag=0 and nickname like concat('%', #{entity.nickname}, '%') and identity_type = #{entity.identityType} - and approval_status = #{entity.approvalStatus} + and approval_time = #{entity.approvalTime} and create_time between #{entity.startTime} and #{entity.endTime} + and approval_status != 0 + and approval_status = #{entity.approvalStatus} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java index 44b201f..111bb46 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java @@ -4,15 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * Entity基类--点亮