Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 0b4f853f6b05b28e3201386bdda3e8af0bfcfc7f

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

@@ -8,11 +8,15 @@
import com.ruoyi.common.core.domain.R;
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.UpAndDownDTO;
import com.ruoyi.system.dto.TQaTestItemEvaluateDTO;
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.vo.TQaTestItemReportVO;
@@ -21,10 +25,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
 * <p>
@@ -36,32 +41,73 @@
 */
@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;
    @Autowired
    public TQaTestItemController(TQaTestItemService qaTestItemService, TQaTestItemReportService qaTestItemReportService) {
    public TQaTestItemController(TQaTestItemService qaTestItemService, TQaTestItemReportService qaTestItemReportService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
        this.qaTestItemService = qaTestItemService;
        this.qaTestItemReportService = qaTestItemReportService;
        this.tokenService = tokenService;
        this.projectTeamService = projectTeamService;
        this.projectTeamStaffService = projectTeamStaffService;
    }

    /**
     * 获取QA检测项管理管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:list')")
    //@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')")
    //@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")
@@ -74,7 +120,7 @@
    /**
     * 修改QA检测项管理
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:edit')")
    //@PreAuthorize("@ss.hasPermi('system:qaTestItem:edit')")
    @Log(title = "QA检测项管理信息-修改QA检测项管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改QA检测项管理")
    @PostMapping(value = "/api/t-qa-test-item/update")
@@ -87,7 +133,7 @@
    /**
     * 查看QA检测项管理详情
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:detail')")
    //@PreAuthorize("@ss.hasPermi('system:qaTestItem:detail')")
    @ApiOperation(value = "查看QA检测项管理详情")
    @GetMapping(value = "/open/t-qa-test-item/getDetailById")
    public R<TQaTestItemVO> getDetailById(@RequestParam String id) {
@@ -103,7 +149,7 @@
    /**
     * 删除QA检测项管理
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
    //@PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
    @Log(title = "QA检测项管理信息-删除QA检测项管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除QA检测项管理")
    @DeleteMapping(value = "/open/t-qa-test-item/deleteById")
@@ -116,7 +162,7 @@
    /**
     * 批量删除QA检测项管理
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
    //@PreAuthorize("@ss.hasPermi('system:qaTestItem:delete')")
    @Log(title = "QA检测项管理信息-删除QA检测项管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除QA检测项管理")
    @DeleteMapping(value = "/open/t-qa-test-item/deleteByIds")
@@ -129,7 +175,7 @@
    /**
     * 修改QA检测项管理
     */
    @PreAuthorize("@ss.hasPermi('system:qaTestItem:commitEvaluate')")
    //@PreAuthorize("@ss.hasPermi('system:qaTestItem:commitEvaluate')")
    @Log(title = "QA检测项管理信息-提交评价QA检测项管理状态", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改QA检测项管理状态")
    @PutMapping(value = "/open/t-qa-test-item/commitEvaluate")
@@ -140,5 +186,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();
    }

}