From 8586161442cbe058fae93bfd35a468485b9b505e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 六月 2025 21:15:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
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..ceed43d 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,29 +6,32 @@
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;
import com.ruoyi.system.query.TQaTestItemQuery;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
-import com.ruoyi.system.service.TQaTestItemReportService;
-import com.ruoyi.system.service.TQaTestItemService;
+import com.ruoyi.system.service.*;
+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;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -49,13 +52,17 @@
private final TokenService tokenService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final SysUserMapper sysUserMapper;
+ private final TNoticeService noticeService;
@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, TNoticeService noticeService) {
this.qaTestItemService = qaTestItemService;
this.qaTestItemReportService = qaTestItemReportService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserMapper = sysUserMapper;
+ this.noticeService = noticeService;
}
/**
@@ -114,6 +121,16 @@
public R<Boolean> add(@RequestBody String param) {
TQaTestItemDTO dto = JSON.parseObject(param,TQaTestItemDTO.class);
qaTestItemService.save(dto);
+
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【项目检测项、检验包列表】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+
return R.ok();
}
@@ -127,6 +144,18 @@
public R<Boolean> update(@RequestBody String param) {
TQaTestItemDTO dto = JSON.parseObject(param,TQaTestItemDTO.class);
qaTestItemService.updateById(dto);
+
+ if (dto.getStatus() != -1) {
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【项目检测项、检验包列表】等待审核", tokenService.getLoginUser().getUser().getNickName(),9);
+ }
+
return R.ok();
}
@@ -142,7 +171,37 @@
BeanUtils.copyProperties(testItem, testItemVO);
// 查询QA检测项检测报告
List<TQaTestItemReportVO> qaTestItemReportVOS= qaTestItemReportService.getList(id);
+ for (TQaTestItemReportVO qaTestItemReportVO : qaTestItemReportVOS) {
+ SysUser sysUser = sysUserMapper.selectUserById(qaTestItemReportVO.getAuditPersonId());
+ if(Objects.nonNull(sysUser)){
+ qaTestItemReportVO.setAuditPersonName(sysUser.getNickName());
+ }
+ }
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);
+ }
+ // 查询评定人名称
+ SysUser sysUser = sysUserMapper.selectUserById(testItem.getEvaluatePersonId());
+ if (Objects.nonNull(sysUser)) {
+ testItemVO.setEvaluatePersonName(sysUser.getNickName());
+ }
+ testItemVO.setProjectTeamVO(projectTeamVO);
return R.ok(testItemVO);
}
@@ -196,7 +255,7 @@
public R<Boolean> evaluate(@RequestBody String param) {
TQaTestItemEvaluateDTO dto = JSON.parseObject(param,TQaTestItemEvaluateDTO.class);
Long userId = tokenService.getLoginUser().getUserId();
- TQaTestItem testItem = qaTestItemService.getById(dto);
+ TQaTestItem testItem = qaTestItemService.getById(dto.getId());
testItem.setStatus(QATestItemStatusEnum.EVALUATED.getCode());
testItem.setEvaluatePersonId(userId);
testItem.setEvaluateTime(LocalDateTime.now());
--
Gitblit v1.7.1