From 33fea8cb7804ba9ee45a1c832907cbde5f336444 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 五月 2025 09:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
index 03a8874..333ef1e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java
@@ -1,10 +1,23 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.enums.QaReportFileEnum;
+import com.ruoyi.system.mapper.TQaReportFileMapper;
import com.ruoyi.system.mapper.TQaTestItemReportMapper;
+import com.ruoyi.system.model.TQaReportFile;
import com.ruoyi.system.model.TQaTestItemReport;
+import com.ruoyi.system.query.TQaTestItemReportQuery;
import com.ruoyi.system.service.TQaTestItemReportService;
+import com.ruoyi.system.vo.TExperimentSchemeVO;
+import com.ruoyi.system.vo.TQaTestItemReportVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +30,31 @@
@Service
public class TQaTestItemReportServiceImpl extends ServiceImpl<TQaTestItemReportMapper, TQaTestItemReport> implements TQaTestItemReportService {
+ @Autowired
+ private TQaReportFileMapper qaReportFileMapper;
+
+ @Override
+ public List<TQaTestItemReportVO> getList(String itemId) {
+ List<TQaTestItemReportVO> list = this.baseMapper.getList(itemId);
+ if(!CollectionUtils.isEmpty(list)){
+ List<String> ids = list.stream().map(TQaTestItemReportVO::getId).collect(Collectors.toList());
+ List<TQaReportFile> qaReportFileList = qaReportFileMapper.selectList(Wrappers.lambdaQuery(TQaReportFile.class)
+ .in(TQaReportFile::getReportId, ids));
+ for (TQaTestItemReportVO tQaTestItemReportVO : list) {
+ List<TQaReportFile> qaReportFiles = qaReportFileList.stream().filter(item -> item.getReportId().equals(tQaTestItemReportVO.getId())
+ && item.getReportType().equals(QaReportFileEnum.TEST_REPORT.getCode()))
+ .collect(Collectors.toList());
+ tQaTestItemReportVO.setQaReportFileList(qaReportFiles);
+ }
+ }
+ return list;
+ }
+
+ @Override
+ public PageInfo<TQaTestItemReportVO> pageList(TQaTestItemReportQuery query) {
+ PageInfo<TQaTestItemReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TQaTestItemReportVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1