From a4965dbb9b0f235cd24a67e6b381d6c9047e0462 Mon Sep 17 00:00:00 2001 From: ls Date: Sat, 12 Jul 2025 18:04:04 +0800 Subject: [PATCH] update --- .../impl/ExperimentDocServiceImpl.java | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 187ad35..031b503 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -499,12 +499,16 @@ public class ExperimentDocServiceImpl extends ServiceImpl jsonArray = JSON.parseArray(testEquipment, JSONObject.class); for (int i = 0; i < jsonArray.size(); i++) { JSONObject o = jsonArray.get(i); - strings.add(new String[] {(strings.size()) + "", Optional.ofNullable( - o.getString("equipment_name")).orElse(""), - Optional.ofNullable(o.getString("managementNo")).orElse(""), Optional.ofNullable( - o.getString("lifespan")).orElse(""), Optional.ofNullable( - o.getString("roomNo")).orElse( - ""),}); + String equipmentId = Optional.ofNullable(o.getString("managementNo")).orElse(""); + if (StringUtils.isBlank(equipmentId)) { + continue; + } + Equipment equipment = equipmentService.getById(equipmentId); + if (Objects.isNull(equipment)) { + continue; + } + strings.add(new String[] {(strings.size()) + "", equipment.getName(), + equipment.getManagementNo(), equipment.getExpireDate(), equipment.getRoomNo(),}); } } } @@ -583,14 +587,20 @@ public class ExperimentDocServiceImpl extends ServiceImpl params = new HashMap<>(); + String equipmentId = Optional.ofNullable(o.getString("managementNo")).orElse(""); + if (StringUtils.isBlank(equipmentId)) { + continue; + } + Equipment equipment = equipmentService.getById(equipmentId); + if (Objects.isNull(equipment)) { + continue; + } params.put("index", (list.size()) + ""); - params.put("设备名称", Optional.ofNullable( - o.getString("equipment_name")).orElse("")); - params.put("管理编号", Optional.ofNullable(o.getString("managementNo")).orElse("")); + params.put("设备名称", equipment.getName()); + params.put("管理编号", equipment.getManagementNo()); params.put("使用日期", experiment.getStartDate()); params.put("归还日期", experiment.getEndDate()); - params.put("计量有效期", Optional.ofNullable( - o.getString("lifespan")).orElse("")); + params.put("计量有效期", equipment.getExpireDate()); params.put("异常记录", ""); list.add(params); }