From 2ff335cf56d2add8d42f456a163d2394f63ff872 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Thu, 26 Mar 2026 17:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/pojo/vo/LiquidTankTaskVO.java    |  3 ++-
 .../device/service/impl/FeiBaSetServiceImpl.java  |  2 +-
 .../desk/produce/mapper/WorkPlanMapper.xml        |  4 ++--
 .../controller/EquipmentController.java           | 15 ++++++++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java
index 0445ee8d..bd38c145 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java
@@ -11,6 +11,7 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
 
 import java.io.Serial;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 视图实体类
@@ -91,6 +92,6 @@ public class LiquidTankTaskVO extends LiquidTankTask {
     @Schema(description = "控制规范(报告)")
     private String norm;
     @Schema(description = "槽液到期时间")
-    private LocalDate tankEndTime;
+    private LocalDateTime tankEndTime;
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java
index 276bd888..3a6d3f60 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java
@@ -104,7 +104,7 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl<FeiBaSetMapper, FeiBaSe
             // 处理响应
             String responseBody = response.body();
             JSONObject result = JSONObject.parseObject(responseBody);
-            log.debug("同步飞靶数据: {}", result.toJSONString());
+            log.error("同步飞靶数据: {}", result.toJSONString());
             if (result != null && result.getInteger("code").equals(0)) {
                 List<JSONObject> jsonList = JSONArray.parseArray(result.getJSONArray("data").toJSONString(), JSONObject.class);
                 if (CollectionUtils.isEmpty(jsonList)) {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index fc71968f..e0651ff2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -148,7 +148,7 @@
     </select>
 
     <select id="getByPartCodeAndSubCodeMes" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartSub">
-        select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a left join DS_PART b
+        select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a inner join DS_PART b
             on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
     </select>
 
@@ -171,7 +171,7 @@
 
     <select id="listByWpiIdMes" resultType="org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail">
         select *,b.ITEM_NAME as trialItem,b.STANDARD_NAME as trialStandard,b.ID as wpiId from QA_WORK_PLAN_ITEM_DETAIL a
-            left join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
+            inner join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
         order by a.UPDATE_TIME,a.GAUGE_VALUE1 desc
     </select>
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
index 3661948f..086816a6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.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;
@@ -34,6 +35,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;
@@ -60,6 +62,7 @@ import java.util.Map;
  * @author BladeX
  * @since 2025-12-22
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/equipment")
@@ -74,9 +77,15 @@ 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);
 	}
 	/**
 	 * 设备信息表 分页