审批功能联调

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.platform.controller.approval;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.ApprovalRequest;
 import com.ruoyi.platform.service.ApprovalService;
@@ -17,7 +19,7 @@ import java.util.List;
 @RestController
 @RequestMapping("sysApproval")
 @Api("系统审批")
-public class SysApprovalController {
+public class SysApprovalController extends BaseController {
 
     @Resource
     private ApprovalService approvalService;
@@ -38,9 +40,10 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/my-apply")
-    public R<List<ApprovalRequest>> getMyApplyList() {
+    public TableDataInfo getMyApplyList() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getMyApplyList(loginUser));
+        List<ApprovalRequest> myApplyList = approvalService.getMyApplyList(loginUser);
+        return getDataTable(myApplyList);
     }
 
     /**
@@ -48,9 +51,10 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/my-applied")
-    public R<List<ApprovalRequest>> getMyAppliedList() {
+    public TableDataInfo getMyAppliedList() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getMyAppliedList(loginUser));
+        List<ApprovalRequest> myAppliedList = approvalService.getMyAppliedList(loginUser);
+        return getDataTable(myAppliedList);
     }
 
     /**
@@ -58,9 +62,10 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/my-rejected")
-    public R<List<ApprovalRequest>> getMyRejectedList() {
+    public TableDataInfo getMyRejectedList() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getMyRejectedList(loginUser));
+        List<ApprovalRequest> myRejectedList = approvalService.getMyRejectedList(loginUser);
+        return getDataTable(myRejectedList);
     }
 
     /**
@@ -75,7 +80,7 @@ public class SysApprovalController {
     }
 
     /**
-     * 审批人
+     * 审批人拒绝
      * @param approval
      * @return
      */
@@ -90,9 +95,11 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/my-approve")
-    public R<List<ApprovalRequest>> getMyApproveList() {
+    public TableDataInfo getMyApproveList() {
+        startPage();
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getMyApproveList(loginUser));
+        List<ApprovalRequest> myApproveList = approvalService.getMyApproveList(loginUser);
+        return getDataTable(myApproveList);
     }
 
     /**
@@ -100,9 +107,10 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/to-approve")
-    public R<List<ApprovalRequest>> getToApproveList() {
+    public TableDataInfo getToApproveList() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getToApproveList(loginUser));
+        List<ApprovalRequest> toApproveList = approvalService.getToApproveList(loginUser);
+        return getDataTable(toApproveList);
     }
 
     /**
@@ -110,9 +118,10 @@ public class SysApprovalController {
      * @return
      */
     @GetMapping("/approved")
-    public R<List<ApprovalRequest>> getApprovedList() {
+    public TableDataInfo getApprovedList() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        return R.ok(approvalService.getApprovedList(loginUser));
+        List<ApprovalRequest> approvedList = approvalService.getApprovedList(loginUser);
+        return getDataTable(approvedList);
     }
 
     /**

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysNotificationController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.platform.controller.approval;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.ApprovalRequest;
@@ -18,7 +19,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("sysNotification")
 @Api("系统通知")
-public class SysNotificationController {
+public class SysNotificationController extends BaseController {
 
     @Resource
     private SysNotificationService sysNotificationService;

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ApprovalInfoMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.platform.mapper;
 
 import com.ruoyi.platform.domain.ApprovalRequest;
-import feign.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,7 +22,7 @@ public interface ApprovalInfoMapper
 
     public int updateApproval(ApprovalRequest approvalRequest);
 
-    List<ApprovalRequest> selectMyApplyList(@Param("applicantId") Long userid,@Param("status") Integer status);
+    List<ApprovalRequest> selectMyApplyList(@Param("applicantId") Long userid, @Param("status") Integer status);
 
     List<ApprovalRequest> selectMyApproveList(@Param("approverId") Long userid,@Param("status") List<Integer> statusList);