From 68e3bb82d2246ea3427bbbd420556b893894b231 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 27 二月 2026 09:29:34 +0800
Subject: [PATCH] 设备核查计划：核查负责人回显为空问题修复
---
cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml | 20 +++++++++++++++++++-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java | 4 ----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index 2de8c93..9eb714c 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -6,7 +6,24 @@
<!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
<select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
select * from (
- select d.*,
+ select
+ d.plan_details_id,
+ d.plan_id,
+ d.device_id,
+ d.device_number,
+ d.device_name,
+ d.check_time,
+ d.check_index,
+ d.check_method,
+ d.how_results,
+ d.check_charger_user_id,
+ CASE WHEN d.check_charger_user='' or d.check_charger_user is null THEN u.name
+ ELSE d.check_charger_user END AS check_charger_user,
+ d.remark,
+ d.create_user,
+ d.create_time,
+ d.update_user,
+ d.update_time,
CASE
WHEN dc.review_status = 0 THEN 3
WHEN dc.review_status = 1 THEN 2
@@ -18,6 +35,7 @@
WHEN dd.record_contrast_id IS NOT NULL THEN 1
ELSE 0 END record_contrast_status
from device_examine_plan_details d
+ left join user u on u.id = d.check_charger_user_id
left join device_examine_record dc on d.plan_details_id = dc.plan_details_id
left join device_examine_record_contrast dd on dd.plan_details_id = dc.plan_details_id
order by check_time asc
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
index 357d1c7..0b58504 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
@@ -77,7 +77,6 @@
public Result getIfsStockReport(IfsStockQueryDTO ifsStockQueryDTO) {
JSONObject jresult = new JSONObject();
- jresult.put("total", 0);
jresult.put("count", 0);
jresult.put("data", new JSONArray());
JSONObject jsonObject = new JSONObject();
@@ -92,9 +91,6 @@
}
//鑾峰彇鎬绘暟閲�
int count = data.getIntValue("TOTAL_RECORD");
- //鑾峰彇椤垫暟
- int total = (int) Math.ceil((double) count / (double) ifsStockQueryDTO.getLimit());
- jresult.put("total", total);
jresult.put("count", count);
jresult.put("data", array);
}
--
Gitblit v1.9.3