diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingReviewExecutor.java index 1d45af43..036f37ea 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingReviewExecutor.java @@ -1,5 +1,7 @@ package org.qinan.safetyeval.app.executor; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.client.api.QualFilingReviewApi; import org.qinan.safetyeval.client.co.QualFilingReviewCO; import org.qinan.safetyeval.client.dto.PageResponse; @@ -8,14 +10,14 @@ import org.qinan.safetyeval.client.dto.QualFilingReviewModifyCmd; import org.qinan.safetyeval.client.dto.QualFilingReviewPageQuery; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.domain.entity.QualFilingReviewEntity; -import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.domain.query.QualFilingReviewQuery; import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService; -import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; +import org.qinan.safetyeval.infrastructure.mapper.QualFilingReviewMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * 资质审核记录执行器（App层） * @@ -28,6 +30,9 @@ public class QualFilingReviewExecutor implements QualFilingReviewApi { @Autowired(required = false) private QualFilingReviewDomainService qualFilingReviewDomainService; + @Resource + private QualFilingReviewMapper qualFilingReviewMapper; + @Override public SingleResponse add(QualFilingReviewAddCmd cmd) { QualFilingReviewEntity entity = new QualFilingReviewEntity(); @@ -71,21 +76,10 @@ public class QualFilingReviewExecutor implements QualFilingReviewApi { @Override public PageResponse page(QualFilingReviewPageQuery query) { - QualFilingReviewQuery domainQuery = new QualFilingReviewQuery(); - domainQuery.setPageNum(query.getCurrent()); - domainQuery.setPageSize(query.getSize()); - domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setFilingId(query.getFilingId()); - domainQuery.setReviewResult(query.getReviewResult()); - domainQuery.setFilingExpertId(query.getFilingExpertId()); - - PageResult pageResult = qualFilingReviewDomainService.page(domainQuery); - - return PageResponse.of( - pageResult.getRecords().stream() - .map(this::toCO) - .collect(java.util.stream.Collectors.toList()), - pageResult.getTotal()); + // 直连 infrastructure 层 Mapper，跳过 domain，由 XML 直接返回 CO，无需转换 + Page page = new Page<>(query.getCurrent(), query.getSize()); + IPage result = qualFilingReviewMapper.page(page, query); + return PageResponse.of(result.getRecords(), result.getTotal()); } private QualFilingReviewCO toCO(QualFilingReviewEntity entity) { diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingReviewGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingReviewGateway.java index 1e5679d1..226dbdbb 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingReviewGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingReviewGateway.java @@ -1,8 +1,6 @@ package org.qinan.safetyeval.domain.gateway; import org.qinan.safetyeval.domain.entity.QualFilingReviewEntity; -import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.domain.query.QualFilingReviewQuery; /** * 资质审核记录Gateway接口（Domain层定义） @@ -18,6 +16,4 @@ public interface QualFilingReviewGateway { QualFilingReviewEntity modify(QualFilingReviewEntity entity); void delete(Long id); - - PageResult page(QualFilingReviewQuery query); } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingReviewQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingReviewQuery.java deleted file mode 100644 index 5bb6a67a..00000000 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingReviewQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.qinan.safetyeval.domain.query; - -import lombok.Data; - -/** - * 资质审核记录领域查询对象 - * - * @author safety-eval - */ -@Data -public class QualFilingReviewQuery { - - /** 当前页 */ - private Long pageNum; - - /** 每页条数 */ - private Long pageSize; - - /** 租户ID */ - private Long tenantId; - - /** 机构id */ - private Long filingId; - - /** 审核结果 1通过 2待定 3不通过 */ - private String reviewResult; - - /** 专家id */ - private Long filingExpertId; -} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingReviewDomainService.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingReviewDomainService.java index c2f88edc..71f15e65 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingReviewDomainService.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingReviewDomainService.java @@ -2,8 +2,6 @@ package org.qinan.safetyeval.domain.service; import org.qinan.safetyeval.domain.entity.QualFilingReviewEntity; import org.qinan.safetyeval.domain.gateway.QualFilingReviewGateway; -import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.domain.query.QualFilingReviewQuery; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -34,8 +32,4 @@ public class QualFilingReviewDomainService { public void delete(Long id) { qualFilingReviewGateway.delete(id); } - - public PageResult page(QualFilingReviewQuery query) { - return qualFilingReviewGateway.page(query); - } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingReviewGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingReviewGatewayImpl.java index 7adc6650..159ab7af 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingReviewGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingReviewGatewayImpl.java @@ -1,21 +1,13 @@ package org.qinan.safetyeval.infrastructure.gatewayimpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.domain.entity.QualFilingReviewEntity; import org.qinan.safetyeval.domain.gateway.QualFilingReviewGateway; -import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.domain.query.QualFilingReviewQuery; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingReviewDO; import org.qinan.safetyeval.infrastructure.mapper.QualFilingReviewMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; /** * 资质审核记录Gateway实现（Infrastructure层） @@ -58,30 +50,6 @@ public class QualFilingReviewGatewayImpl implements QualFilingReviewGateway { qualFilingReviewMapper.deleteById(id); } - @Override - public PageResult page(QualFilingReviewQuery query) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(QualFilingReviewDO::getDeleteEnum, "false"); - if (query.getFilingId() != null) { - wrapper.eq(QualFilingReviewDO::getFilingId, query.getFilingId()); - } - if (StringUtils.hasText(query.getReviewResult())) { - wrapper.eq(QualFilingReviewDO::getReviewResult, query.getReviewResult()); - } - if (query.getFilingExpertId() != null) { - wrapper.eq(QualFilingReviewDO::getFilingExpertId, query.getFilingExpertId()); - } - - Page page = new Page<>(query.getPageNum(), query.getPageSize()); - IPage result = qualFilingReviewMapper.selectPage(page, wrapper); - - List entities = result.getRecords().stream() - .map(this::toEntity) - .collect(Collectors.toList()); - - return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); - } - private QualFilingReviewDO toDO(QualFilingReviewEntity entity) { QualFilingReviewDO dataObject = new QualFilingReviewDO(); dataObject.setFilingId(entity.getFilingId()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingReviewMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingReviewMapper.java index 2c133d05..1cd7de7a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingReviewMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingReviewMapper.java @@ -1,9 +1,23 @@ package org.qinan.safetyeval.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.qinan.safetyeval.client.co.QualFilingReviewCO; +import org.qinan.safetyeval.client.dto.QualFilingReviewPageQuery; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingReviewDO; @Mapper public interface QualFilingReviewMapper extends BaseMapper { + + /** + * 分页查询资质审核记录，关联专家表获取专家名称，直接返回 CO + * + * @param page 分页参数 + * @param query 查询条件 + * @return 分页结果 + */ + IPage page(Page page, @Param("query") QualFilingReviewPageQuery query); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingReviewMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingReviewMapper.xml index 58e1f88b..36b08fa3 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingReviewMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingReviewMapper.xml @@ -29,4 +29,33 @@ `id`, `filing_id`, `review_result`, `review_result_remark`, `filing_expert_id`, `filing_expert_name`, `review_opinion`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + + + + +