From 60fd8edf714dcb9327d0d884a85c5e2b236fe3cc Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Thu, 2 Apr 2026 15:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=95=E8=AE=B0=E5=BD=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlanTestServiceImpl.java     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java
index cf50b569..84470846 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java
@@ -69,20 +69,27 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes
     @Override
     public JSONArray detailPage(PlanTest prPlanTest) {
         PlanTest test = baseMapper.selectById(prPlanTest.getId());
-        if(null != test){
-            WorkPlan prWorkPlan = workPlanService.getById(test.getWpId());
-            if(null != prWorkPlan){
-                WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId());
-                if(null != prWorkOrder){
-                    JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId());
-                    if (obj != null) {
-                        JSONObject data = obj.getJSONObject("data");
-                        return data.getJSONArray("nodeEndTime");
-                    }
-                }
-
-            }
+        WorkPlan prWorkPlan = workPlanService.getById(test.getWpId());
+        WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId());
+        JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId());
+        if (obj != null) {
+            JSONObject data = obj.getJSONObject("data");
+            return data.getJSONArray("nodeEndTime");
         }
+//        if(null != test){
+//            WorkPlan prWorkPlan = workPlanService.getById(test.getWpId());
+//            if(null != prWorkPlan){
+//                WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId());
+//                if(null != prWorkOrder){
+//                    JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId());
+//                    if (obj != null) {
+//                        JSONObject data = obj.getJSONObject("data");
+//                        return data.getJSONArray("nodeEndTime");
+//                    }
+//                }
+//
+//            }
+//        }
         return null;
     }