修改接口

xuhy

2025-05-28 861760a9fc4855e733d1cd0234b3083926914194

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

@@ -6,10 +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;
@@ -18,14 +22,17 @@
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;
import java.util.List;
import java.util.stream.Collectors;

@@ -47,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;
    }

    /**
@@ -77,6 +86,29 @@
            }
        }
        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));
    }

    /**
@@ -118,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);
    }

@@ -161,5 +212,24 @@
        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);
        testItem.setStatus(QATestItemStatusEnum.EVALUATED.getCode());
        testItem.setEvaluatePersonId(userId);
        testItem.setEvaluateTime(LocalDateTime.now());
        testItem.setEvaluateScore(dto.getEvaluateScore());
        qaTestItemService.updateById(testItem);
        return R.ok();
    }

}