From 618517e7ad4e3e7e9865c324cdabd90bf8ef8d17 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 21 三月 2024 16:54:14 +0800 Subject: [PATCH] 核算权限注释 --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java index 43a9293..8374785 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java @@ -1,5 +1,6 @@ package com.ycl.platform.service.impl; +import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.CheckRule; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.mapper.CheckRuleMapper; @@ -106,12 +107,13 @@ @Override public Result page(CheckRuleQuery query) { - IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper) + IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper) .like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName()) .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()), CheckRule::getCreateTime, DateUtils.getDayStart(query.getStart()), DateUtils.getDayEnd(query.getEnd())) + .eq(Objects.nonNull(query.getAuditState()),CheckRule::getAuditState, query.getAuditState()) .orderByDesc(CheckRule::getCreateTime) .page(PageUtil.getPage(query, CheckRule.class)); @@ -144,9 +146,14 @@ @Override public Result all() { List<CheckRule> entities = baseMapper.selectList(null); - List<CheckRuleVO> vos = entities.stream() + List<BaseSelect> vos = entities.stream() .map( - entity -> CheckRuleVO.getVoByEntity(entity, null) + entity -> { + BaseSelect vo = new BaseSelect(); + vo.setId(entity.getId()); + vo.setValue(entity.getRuleName()); + return vo; + } ) .collect(Collectors.toList()); return Result.ok().data(vos); -- Gitblit v1.8.0