bug修改

xuhy

3 天以前 bd4830badb61f6a888218a663f3d1bc36b8056c8

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

@@ -53,6 +53,8 @@
    @Resource
    private TExperimentResultReportService experimentResultReportService;
    @Resource
    private TExperimentSchemeService experimentSchemeService;
    @Resource
    private TProjectApprovalReportService projectApprovalReportService;
    @Resource
    private TExperimentDispatchService experimentDispatchService;
@@ -475,7 +477,6 @@
            switch (evaluateSix) {
                case 1:
                    temp1 -= 3;
                    temp5++;
                    if (tResultWorkEvaluate.getEvaluateType() == 1) {
                        temp2 -= 3;
                    }
@@ -492,10 +493,26 @@
        tResultWorkEvaluateDetailVO.setEngineerIntegral(temp2);
        tResultWorkEvaluateDetailVO.setChemistIntegral(temp3);
        tResultWorkEvaluateDetailVO.setTesterIntegral(temp4);
        tResultWorkEvaluateDetailVO.setTermination(temp5);
        if (!list.isEmpty()) {
            tResultWorkEvaluateDetailVO.setEndTime(list.get(0).getEvaluateTime());
        }
        // 查询项目组总的失败次数
        String teamId = resultWorkEvaluate.getTeamId();
        List<String> projectProposalIds = projectProposalService.lambdaQuery().eq(TProjectProposal::getTeamId, teamId).list()
                .stream().map(TProjectProposal::getId).collect(Collectors.toList());
        if (projectProposalIds.isEmpty()){
            tResultWorkEvaluateDetailVO.setTermination(0);
        }else{
            List<String> experimentDispatchIds = experimentDispatchService.lambdaQuery().in(TExperimentDispatch::getProposalId, projectProposalIds).list()
                    .stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
            if (experimentDispatchIds.isEmpty()){
                tResultWorkEvaluateDetailVO.setTermination(0);
            }else{
                Long count = experimentSchemeService.lambdaQuery().in(TExperimentScheme::getDispatchId, experimentDispatchIds)
                        .eq(TExperimentScheme::getStatus, 3).count();
                tResultWorkEvaluateDetailVO.setTermination(count.intValue());
            }
        }

        return R.ok(tResultWorkEvaluateDetailVO);
    }