diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/vo/MyMesApprovalRecordVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/vo/MyMesApprovalRecordVO.java index c3c064699..e4862aabe 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/vo/MyMesApprovalRecordVO.java +++ b/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; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java index 304a3f451..4fda09b1d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java +++ b/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 selectMyMesApprovalRecordPage(Page page, MyMesApprovalRecordVO mesApprovalRecord) { + List statusList = null; + if(StringUtils.isNotBlank(mesApprovalRecord.getStatusList())){ + statusList = Arrays.stream(mesApprovalRecord.getStatusList().split(",")) + .filter(StringUtils::isNotBlank) + .map(Integer::valueOf) + .collect(Collectors.toList()); + } Page mesNotifyMessageVOPage = this.page(page, new LambdaQueryWrapper() .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 page1 = new Page<>(); @@ -79,6 +89,7 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl selectMyHistoryMesApprovalRecordPage(IPage page, MyHistoryMesApprovalRecordVO mesApprovalRecord) { List myHistoryMesApprovalRecordVOList = baseMapper.selectMyHistoryMesApprovalRecordPage(page, mesApprovalRecord);