模型发布审批功能

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<ApprovalRequest> myApproveList = approvalService.getMyApproveList(loginUser);
+        List<ApprovalRequest> 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("新增审批单成功");
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java

@@ -21,7 +21,7 @@ public interface ApprovalService {
 
     List<ApprovalRequest> getMyApplyList(LoginUser loginUser);
 
-    List<ApprovalRequest> getMyApproveList(LoginUser loginUser);
+    List<ApprovalRequest> getMyApproveList(LoginUser loginUser,Integer status);
 
     List<ApprovalRequest> getToApproveList(LoginUser loginUser);
 

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="您发布的{}<b>\"{}\"</b>{}审核未通过";
+        String applyContentTemplate="您发布的{}<b>\"{}\"</b>审核未通过";
         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<ApprovalRequest> getMyApproveList(LoginUser loginUser) {
-        return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), null);
+    public List<ApprovalRequest> getMyApproveList(LoginUser loginUser,Integer status) {
+        return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), status==null?null:ListUtil.toList(status));
     }
 
     @Override

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ApprovalInfoMapper.xml

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approverId != null and approverId != ''">
                 AND approver_id = #{approverId}
             </if>
-            <if test="status != null and status != ''">
+            <if test="statusList != null ">
                 AND status in
                 <foreach collection="array" item="status" open="(" separator="," close=")">
                     #{status}