bug修改

xuhy

3 天以前 14789ce3e98e9c60039eaff9e3932b5f78ecac19

 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,11 +493,12 @@
        tResultWorkEvaluateDetailVO.setEngineerIntegral(temp2);
        tResultWorkEvaluateDetailVO.setChemistIntegral(temp3);
        tResultWorkEvaluateDetailVO.setTesterIntegral(temp4);
        tResultWorkEvaluateDetailVO.setTermination(temp5);
        if (!list.isEmpty()) {
            tResultWorkEvaluateDetailVO.setEndTime(list.get(0).getEvaluateTime());
        }

        Long count = experimentSchemeService.lambdaQuery().eq(TExperimentScheme::getDispatchId, resultWorkEvaluate.getDispatchId())
                .eq(TExperimentScheme::getStatus, 3).count();
        tResultWorkEvaluateDetailVO.setTermination(count.intValue());
        return R.ok(tResultWorkEvaluateDetailVO);
    }