From 861760a9fc4855e733d1cd0234b3083926914194 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 28 五月 2025 09:35:21 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemVO.java | 3 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java | 28 +++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemReportVO.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 28 ++++++++++++-
ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaProduceReportVO.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 26 ++++++++----
7 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
index 839d2a4..e87027d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -12,17 +12,20 @@
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TQaProduceReportDTO;
import com.ruoyi.system.dto.TQaProduceReportEvaluateDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.model.TQaProduceReport;
import com.ruoyi.system.model.TQaReportFile;
import com.ruoyi.system.query.TQaProduceReportQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TProjectTeamVO;
import com.ruoyi.system.vo.TQaProduceReportVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -49,14 +52,16 @@
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
@Autowired
- public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) {
+ public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, SysUserMapper sysUserMapper) {
this.qaProduceReportService = qaProduceReportService;
this.qaReportFileService = qaReportFileService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
}
/**
@@ -225,8 +230,25 @@
.eq(TQaReportFile::getReportId, id)
.ne(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
qaProduceReportVO.setQaReportFileList(qaReportFiles);
- // 获取项目组名称
- qaProduceReportVO.setTeamName(projectTeamService.getById(qaProduceReport.getTeamId()).getTeamName());
+ // 查询项目组名称
+ TProjectTeam projectTeam = projectTeamService.getById(qaProduceReport.getTeamId());
+ TProjectTeamVO projectTeamVO = new TProjectTeamVO();
+ BeanUtils.copyProperties(projectTeam, projectTeamVO);
+ // 查询项目组成员
+ List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, qaProduceReport.getTeamId()));
+ if (!CollectionUtils.isEmpty(list)){
+ List<Long> userIds = list.stream().map(TProjectTeamStaff::getUserId).distinct().collect(Collectors.toList());
+ // 查询所有人员
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ for (TProjectTeamStaff tProjectTeamStaff : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
+ tProjectTeamStaff.setNickName(sysUser.getNickName());
+ tProjectTeamStaff.setAvatar(sysUser.getAvatar());
+ });
+ }
+ projectTeamVO.setStaffs(list);
+ }
+ qaProduceReportVO.setProjectTeamVO(projectTeamVO);
// 获取审批人名称
SysUser sysUser = sysUserService.selectUserById(qaProduceReport.getAuditPersonId());
if (Objects.nonNull(sysUser)) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
index 28c9ac8..cee8003 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
@@ -6,11 +6,14 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemStatusEnum;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TQaTestItemDTO;
import com.ruoyi.system.dto.TQaTestItemEvaluateDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.model.TQaTestItem;
import com.ruoyi.system.model.TQaTestItemReport;
@@ -19,12 +22,14 @@
import com.ruoyi.system.service.TProjectTeamStaffService;
import com.ruoyi.system.service.TQaTestItemReportService;
import com.ruoyi.system.service.TQaTestItemService;
+import com.ruoyi.system.vo.TProjectTeamVO;
import com.ruoyi.system.vo.TQaTestItemReportVO;
import com.ruoyi.system.vo.TQaTestItemVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -49,13 +54,15 @@
private final TokenService tokenService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final SysUserMapper sysUserMapper;
@Autowired
- public TQaTestItemController(TQaTestItemService qaTestItemService, TQaTestItemReportService qaTestItemReportService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TQaTestItemController(TQaTestItemService qaTestItemService, TQaTestItemReportService qaTestItemReportService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, SysUserMapper sysUserMapper) {
this.qaTestItemService = qaTestItemService;
this.qaTestItemReportService = qaTestItemReportService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserMapper = sysUserMapper;
}
/**
@@ -143,6 +150,25 @@
// 查询QA检测项检测报告
List<TQaTestItemReportVO> qaTestItemReportVOS= qaTestItemReportService.getList(id);
testItemVO.setQaTestItemReportList(qaTestItemReportVOS);
+ // 查询项目组名称
+ TProjectTeam projectTeam = projectTeamService.getById(testItemVO.getTeamId());
+ TProjectTeamVO projectTeamVO = new TProjectTeamVO();
+ BeanUtils.copyProperties(projectTeam, projectTeamVO);
+ // 查询项目组成员
+ List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, testItemVO.getTeamId()));
+ if (!CollectionUtils.isEmpty(list)){
+ List<Long> userIds = list.stream().map(TProjectTeamStaff::getUserId).distinct().collect(Collectors.toList());
+ // 查询所有人员
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ for (TProjectTeamStaff tProjectTeamStaff : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
+ tProjectTeamStaff.setNickName(sysUser.getNickName());
+ tProjectTeamStaff.setAvatar(sysUser.getAvatar());
+ });
+ }
+ projectTeamVO.setStaffs(list);
+ }
+ testItemVO.setProjectTeamVO(projectTeamVO);
return R.ok(testItemVO);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
index 6259dfe..9c08610 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.QATestItemReportStatusEnum;
import com.ruoyi.common.enums.QaReportFileEnum;
@@ -18,15 +19,13 @@
import com.ruoyi.system.model.TQaReportFile;
import com.ruoyi.system.model.TQaTestItemReport;
import com.ruoyi.system.query.TQaTestItemReportQuery;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
-import com.ruoyi.system.service.TQaReportFileService;
-import com.ruoyi.system.service.TQaTestItemReportService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TQaTestItemReportVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -52,13 +51,15 @@
private final TokenService tokenService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final ISysUserService sysUserService;
@Autowired
- public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) {
this.qaTestItemReportService = qaTestItemReportService;
this.qaReportFileService = qaReportFileService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserService = sysUserService;
}
/**
@@ -154,11 +155,13 @@
.eq(TQaReportFile::getReportId, dto.getId()));
// 添加检测报告文件
List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
- for (TQaReportFile qaReportFile : qaReportFiles) {
- qaReportFile.setReportId(dto.getId());
- qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
+ if(!CollectionUtils.isEmpty(qaReportFiles)){
+ for (TQaReportFile qaReportFile : qaReportFiles) {
+ qaReportFile.setReportId(dto.getId());
+ qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
+ }
+ qaReportFileService.saveBatch(qaReportFiles);
}
- qaReportFileService.saveBatch(qaReportFiles);
return R.ok();
}
@@ -177,6 +180,11 @@
.eq(TQaReportFile::getReportId, id)
.eq(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
testItemReportVO.setQaReportFileList(qaReportFiles);
+ // 查询审批人姓名
+ SysUser sysUser = sysUserService.selectUserById(testItemReportVO.getAuditPersonId());
+ if(Objects.nonNull(sysUser)){
+ testItemReportVO.setAuditPersonName(sysUser.getNickName());
+ }
return R.ok(testItemReportVO);
}
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 333ef1e..9edac03 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
@@ -10,7 +10,6 @@
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;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaProduceReportVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaProduceReportVO.java
index 5f99625..82076ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaProduceReportVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaProduceReportVO.java
@@ -11,7 +11,8 @@
@Data
@ApiModel(value = "中试、生产验证分析报告；辅料；产品报告VO")
public class TQaProduceReportVO extends TQaProduceReport {
-
+ @ApiModelProperty(value = "项目组信息")
+ private TProjectTeamVO projectTeamVO;
@ApiModelProperty(value = "项目组名称")
private String teamName;
@ApiModelProperty(value = "审批人名称")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemReportVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemReportVO.java
index acb2291..93f5ec1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemReportVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemReportVO.java
@@ -15,4 +15,15 @@
@ApiModelProperty(value = "检测报告文件")
private List<TQaReportFile> qaReportFileList;
+ @ApiModelProperty(value = "检测项名称")
+ private String itemName;
+
+ @ApiModelProperty(value = "检测项编号")
+ private String itemCode;
+
+ @ApiModelProperty(value = "项目组名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "审核人名称")
+ private String auditPersonName;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemVO.java
index 277d49d..73fdbf9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TQaTestItemVO.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.vo;
-import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TQaTestItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +12,7 @@
public class TQaTestItemVO extends TQaTestItem {
@ApiModelProperty(value = "项目组信息")
- private TProjectTeam projectTeam;
+ private TProjectTeamVO projectTeamVO;
@ApiModelProperty(value = "项目组名称")
private String teamName;
--
Gitblit v1.7.1