xuhy
5 天以前 14789ce3e98e9c60039eaff9e3932b5f78ecac19
bug修改
3个文件已修改
14 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -64,6 +64,9 @@
            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
                AND tes.status != 5
            </if>
            <if test="query.roleType != null and query.roleType == 5">
                AND tes.status != 6
            </if>
            <if test="query.status == null">
                and tes.status != -1
            </if>
ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
@@ -56,6 +56,9 @@
            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
                AND tsr.status != 3
            </if>
            <if test="query.roleType != null and query.roleType == 5">
                AND tsr.status != 2
            </if>
            <if test="query.status == null">
                and tsr.status != -1
            </if>