bug修改

xuhy

4 天以前 7e9fea768cf8ef436c6378bf29170523721bfc77

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java

@@ -34,6 +34,7 @@

import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -149,6 +150,12 @@
        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());
@@ -167,6 +174,11 @@
                });
            }
            projectTeamVO.setStaffs(list);
        }
        // 查询评定人名称
        SysUser sysUser = sysUserMapper.selectUserById(testItem.getEvaluatePersonId());
        if (Objects.nonNull(sysUser)) {
            testItemVO.setEvaluatePersonName(sysUser.getNickName());
        }
        testItemVO.setProjectTeamVO(projectTeamVO);
        return R.ok(testItemVO);
@@ -222,7 +234,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());