From 57f27d12ee7dbe684d47dccb286cf54b73b2a0a9 Mon Sep 17 00:00:00 2001 From: ddmte32 Date: Wed, 3 Sep 2025 16:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=91=E5=B8=83=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/SysApprovalController.java | 15 ++++++++++++--- .../ruoyi/platform/service/ApprovalService.java | 2 +- .../service/impl/ApprovalServiceImpl.java | 6 +++--- .../managementPlatform/ApprovalInfoMapper.xml | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java index 0c0a30b0..83f8d7d7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java @@ -26,6 +26,7 @@ public class SysApprovalController extends BaseController { /** * 申请人提交审批 + * * @param approvalRequest * @return */ @@ -37,6 +38,7 @@ public class SysApprovalController extends BaseController { /** * 获取申请人申请列表 + * * @return */ @GetMapping("/my-apply") @@ -48,6 +50,7 @@ public class SysApprovalController extends BaseController { /** * 获取申请人已申请列表 + * * @return */ @GetMapping("/my-applied") @@ -59,6 +62,7 @@ public class SysApprovalController extends BaseController { /** * 获取申请人被拒绝列表 + * * @return */ @GetMapping("/my-rejected") @@ -70,6 +74,7 @@ public class SysApprovalController extends BaseController { /** * 审批人审批 + * * @param approval * @return */ @@ -81,6 +86,7 @@ public class SysApprovalController extends BaseController { /** * 审批人拒绝 + * * @param approval * @return */ @@ -92,18 +98,20 @@ public class SysApprovalController extends BaseController { /** * 获取审批人审批列表 + * * @return */ @GetMapping("/my-approve") - public TableDataInfo getMyApproveList() { + public TableDataInfo getMyApproveList(@RequestParam(value = "status", required = false) Integer status) { startPage(); LoginUser loginUser = SecurityUtils.getLoginUser(); - List myApproveList = approvalService.getMyApproveList(loginUser); + List myApproveList = approvalService.getMyApproveList(loginUser, status); return getDataTable(myApproveList); } /** * 获取审批人待审批列表 + * * @return */ @GetMapping("/to-approve") @@ -115,6 +123,7 @@ public class SysApprovalController extends BaseController { /** * 获取审批人已审批列表 + * * @return */ @GetMapping("/approved") @@ -132,7 +141,7 @@ public class SysApprovalController extends BaseController { */ @PostMapping("/add") @ApiOperation("新增审批单") - public AjaxResult add( @RequestBody ApprovalRequest approvalRequest) { + public AjaxResult add(@RequestBody ApprovalRequest approvalRequest) { approvalService.add(approvalRequest); return AjaxResult.success("新增审批单成功"); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java index e04c82bd..c3d44399 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java @@ -21,7 +21,7 @@ public interface ApprovalService { List getMyApplyList(LoginUser loginUser); - List getMyApproveList(LoginUser loginUser); + List getMyApproveList(LoginUser loginUser,Integer status); List getToApproveList(LoginUser loginUser); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java index d3cc77ed..fa7cc4d0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java @@ -94,7 +94,7 @@ public class ApprovalServiceImpl implements ApprovalService { //推送消息给申请人 NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); - String applyContentTemplate="您发布的{}\"{}\"{}审核未通过"; + String applyContentTemplate="您发布的{}\"{}\"审核未通过"; String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(info.getType()) ,getModelNameByType(info.getContent(),info.getType())); @@ -136,8 +136,8 @@ public class ApprovalServiceImpl implements ApprovalService { } @Override - public List getMyApproveList(LoginUser loginUser) { - return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), null); + public List getMyApproveList(LoginUser loginUser,Integer status) { + return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), status==null?null:ListUtil.toList(status)); } @Override diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml index 973a3518..45b08a9e 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND approver_id = #{approverId} - + AND status in #{status}