From 251f3c87bb97be2386205396e2123b5ebf12bd41 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Thu, 26 Mar 2026 19:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/controller/EquipmentController.java     | 14 +++++++++++---
 .../controller/InspectionTaskController.java       | 10 ++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
index bf76daa3..701be700 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.device.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -37,6 +38,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.log.annotation.ApiLog;
@@ -63,6 +65,7 @@ import java.util.Map;
  * @author qyl
  * @since 2025-12-26
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/equipment")
@@ -77,9 +80,14 @@ public class EquipmentController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@Operation(summary = "详情", description  = "传入equipment")
-	public R<EquipmentVO> detail(EquipmentEntity equipment) {
-		EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));
-		return R.data(EquipmentWrapper.build().entityVO(detail));
+	public R<EquipmentEntity> detail(EquipmentEntity equipment) {
+		log.error("设备的ID是"+equipment.getId());
+		EquipmentEntity detail = equipmentService.getById(equipment.getId());
+		log.error("设备数据000001: {}"+ detail);
+		JSONObject result = JSONObject.parseObject(detail.toString());
+		log.error("设备数据: {}"+ result.toJSONString());
+//		EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));
+		return R.data(detail);
 	}
 
 	/**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
index 0b8964d9..d5599e35 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
@@ -124,8 +124,14 @@ public class InspectionTaskController extends BladeController {
 //        InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
         log.error("[检验任务]id="+inspectionTask.getId());
         InspectionTask detail = service.getById(inspectionTask.getId());
-
-        InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
+        log.error("检验任务数据000001: {}"+ detail);
+        JSONObject result = JSONObject.parseObject(detail.toString());
+        log.error("检验任务数据: {}"+ result.toJSONString());
+//        InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
+
+//        InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
+        InspectionTaskDetailVO detailDetailVO = new InspectionTaskDetailVO();
+        BeanUtils.copyProperties(inspectionTask, detailDetailVO);
         BladeUser user = AuthUtil.getUser();
 //        InspectionTaskListVO detailDetail = service.detailById(inspectionTask);
         service.setDetailVOValue(detailDetailVO);