From 8f55b92a5a936d3358bb8a9f2fe67c697ba99be0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 15:09:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java | 252 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 249 insertions(+), 3 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 13557e0..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
@@ -1,9 +1,38 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.*;
+import com.ruoyi.system.vo.TProjectTeamVO;
+import com.ruoyi.system.vo.TQaTestItemReportVO;
+import com.ruoyi.system.vo.TQaTestItemVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
/**
* <p>
@@ -15,8 +44,225 @@
*/
@Api(tags = "QA检测项管理")
@RestController
-@RequestMapping("/t-qa-test-item")
+@RequestMapping("")
public class TQaTestItemController {
+ private final TQaTestItemService qaTestItemService;
+ private final TQaTestItemReportService qaTestItemReportService;
+ 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, 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;
+ }
+
+ /**
+ * 获取QA检测项管理管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:list')")
+ @ApiOperation(value = "获取QA检测项管理分页列表", response = TQaTestItemQuery.class)
+ @PostMapping(value = "/api/t-qa-test-item/pageList")
+ public R<PageInfo<TQaTestItemVO>> pageList(@RequestBody String param) {
+ TQaTestItemQuery query = JSON.parseObject(param, TQaTestItemQuery.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 1){
+ // 查询用户所在项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(projectTeamStaffs.size() > 0){
+ // 查询项目组id
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
+ query.setTeamIds(teamIds);
+ }
+ }
+ return R.ok(qaTestItemService.pageList(query));
+ }
+
+ /**
+ * 获取QA检测项管理评定列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:evaluateList')")
+ @ApiOperation(value = "获取QA检测项管理评定列表", response = TQaTestItemQuery.class)
+ @PostMapping(value = "/api/t-qa-test-item/evaluateList")
+ public R<PageInfo<TQaTestItemVO>> evaluateList(@RequestBody String param) {
+ TQaTestItemQuery query = JSON.parseObject(param, TQaTestItemQuery.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 1){
+ // 查询用户所在项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(projectTeamStaffs.size() > 0){
+ // 查询项目组id
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
+ query.setTeamIds(teamIds);
+ }
+ }
+ return R.ok(qaTestItemService.evaluateList(query));
+ }
+
+ /**
+ * 添加QA检测项管理管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:add')")
+ @Log(title = "QA检测项管理信息-新增QA检测项管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加QA检测项管理",response = TQaTestItemDTO.class)
+ @PostMapping(value = "/api/t-qa-test-item/add")
+ 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();
+ }
+
+ /**
+ * 修改QA检测项管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:edit')")
+ @Log(title = "QA检测项管理信息-修改QA检测项管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改QA检测项管理")
+ @PostMapping(value = "/api/t-qa-test-item/update")
+ 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();
+ }
+
+ /**
+ * 查看QA检测项管理详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:detail')")
+ @ApiOperation(value = "查看QA检测项管理详情")
+ @GetMapping(value = "/open/t-qa-test-item/getDetailById")
+ public R<TQaTestItemVO> getDetailById(@RequestParam String id) {
+ TQaTestItem testItem = qaTestItemService.getById(id);
+ TQaTestItemVO testItemVO = new TQaTestItemVO();
+ 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);
+ }
+
+ /**
+ * 删除QA检测项管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
+ @Log(title = "QA检测项管理信息-删除QA检测项管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除QA检测项管理")
+ @DeleteMapping(value = "/open/t-qa-test-item/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ // 删除QA检测项管理成员
+ qaTestItemReportService.remove(Wrappers.lambdaQuery(TQaTestItemReport.class).eq(TQaTestItemReport::getItemId, id));
+ return R.ok(qaTestItemService.removeById(id));
+ }
+
+ /**
+ * 批量删除QA检测项管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
+ @Log(title = "QA检测项管理信息-删除QA检测项管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除QA检测项管理")
+ @DeleteMapping(value = "/open/t-qa-test-item/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ // 删除QA检测项检测报告
+ qaTestItemReportService.remove(Wrappers.lambdaQuery(TQaTestItemReport.class).in(TQaTestItemReport::getItemId, ids));
+ return R.ok(qaTestItemService.removeByIds(ids));
+ }
+
+ /**
+ * 修改QA检测项管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:commitEvaluate')")
+ @Log(title = "QA检测项管理信息-提交评价QA检测项管理状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改QA检测项管理状态")
+ @PutMapping(value = "/open/t-qa-test-item/commitEvaluate")
+ public R<Boolean> commitEvaluate(@RequestParam String id) {
+ TQaTestItem testItem = qaTestItemService.getById(id);
+ testItem.setStatus(QATestItemStatusEnum.TO_BE_EVALUATED.getCode());
+ qaTestItemService.updateById(testItem);
+ return R.ok();
+ }
+
+ /**
+ * 评定QA检测项管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItem:evaluate')")
+ @Log(title = "QA检测项管理信息-评定QA检测项管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "评定QA检测项管理",response = TQaTestItemEvaluateDTO.class)
+ @PostMapping(value = "/api/t-qa-test-item/evaluate")
+ public R<Boolean> evaluate(@RequestBody String param) {
+ TQaTestItemEvaluateDTO dto = JSON.parseObject(param,TQaTestItemEvaluateDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ TQaTestItem testItem = qaTestItemService.getById(dto.getId());
+ testItem.setStatus(QATestItemStatusEnum.EVALUATED.getCode());
+ testItem.setEvaluatePersonId(userId);
+ testItem.setEvaluateTime(LocalDateTime.now());
+ testItem.setEvaluateScore(dto.getEvaluateScore());
+ qaTestItemService.updateById(testItem);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1