我的待办，我的已办

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/vo/MyMesApprovalRecordVO.java

@@ -12,5 +12,9 @@ import lombok.EqualsAndHashCode;
 @Data
 public class MyMesApprovalRecordVO extends MesApprovalRecordVO{
 
+    private String statusName;
+
     private String createUserName;
+
+    private String statusList;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java

@@ -26,6 +26,8 @@
 package org.springblade.desk.common.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.util.StringUtils;
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -67,9 +69,17 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
 
     @Override
     public IPage<MyMesApprovalRecordVO> selectMyMesApprovalRecordPage(Page<MesApprovalRecordEntity> page, MyMesApprovalRecordVO mesApprovalRecord) {
+        List<Integer> statusList = null;
+        if(StringUtils.isNotBlank(mesApprovalRecord.getStatusList())){
+            statusList = Arrays.stream(mesApprovalRecord.getStatusList().split(","))
+                    .filter(StringUtils::isNotBlank)
+                    .map(Integer::valueOf)
+                    .collect(Collectors.toList());
+        }
         Page<MesApprovalRecordEntity> mesNotifyMessageVOPage = this.page(page, new LambdaQueryWrapper<MesApprovalRecordEntity>()
                 .eq(StrUtil.isNotEmpty(mesApprovalRecord.getBizType()), MesApprovalRecordEntity::getBizType, mesApprovalRecord.getBizType())
                         .eq(mesApprovalRecord.getStatus() != null, MesApprovalRecordEntity::getStatus, mesApprovalRecord.getStatus())
+                        .in(CollectionUtils.isNotEmpty(statusList), MesApprovalRecordEntity::getStatus, statusList)
                 .like(StrUtil.isNotEmpty(mesApprovalRecord.getContent()), MesApprovalRecordEntity::getContent, mesApprovalRecord.getContent())
                 .orderByDesc(MesApprovalRecordEntity::getCreateTime));
         Page<MyMesApprovalRecordVO> page1 = new Page<>();
@@ -79,6 +89,7 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
                 MyMesApprovalRecordVO recordVO = new MyMesApprovalRecordVO();
                 BeanUtils.copyProperties(entity, recordVO);
                 recordVO.setCreateUserName(AuthUtil.getUserName());
+                recordVO.setStatusName(buildStatusName(recordVO.getStatus()));
                 recordVOList.add(recordVO);
             });
             page1.setRecords(recordVOList);
@@ -90,6 +101,13 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
         return page1;
     }
 
+    private String buildStatusName(Integer status){
+        if(status == ApprovalStatusConstant.WAITING) return "待审核";
+        if(status == ApprovalStatusConstant.PASS) return "审核通过";
+        if(status == ApprovalStatusConstant.REJECT) return "审核失败";
+        return null;
+    }
+
     @Override
     public IPage<MyHistoryMesApprovalRecordVO> selectMyHistoryMesApprovalRecordPage(IPage<MyHistoryMesApprovalRecordVO> page, MyHistoryMesApprovalRecordVO mesApprovalRecord) {
         List<MesApprovalRecordEntity> myHistoryMesApprovalRecordVOList = baseMapper.selectMyHistoryMesApprovalRecordPage(page, mesApprovalRecord);