From 14789ce3e98e9c60039eaff9e3932b5f78ecac19 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 17:42:58 +0800
Subject: [PATCH] bug修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
index 5e45069..56cea19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
+++ b/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);
     }
 

--
Gitblit v1.7.1