physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-07-12 18:04:04 +08:00
parent 20a774f842
commit a4965dbb9b
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
View File

@@ -499,12 +499,16 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
List<JSONObject> jsonArray = JSON.parseArray(testEquipment, JSONObject.class); List<JSONObject> jsonArray = JSON.parseArray(testEquipment, JSONObject.class);
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject o = jsonArray.get(i); JSONObject o = jsonArray.get(i);
strings.add(new String[] {(strings.size()) + "", Optional.ofNullable( String equipmentId = Optional.ofNullable(o.getString("managementNo")).orElse("");
o.getString("equipment_name")).orElse(""), if (StringUtils.isBlank(equipmentId)) {
Optional.ofNullable(o.getString("managementNo")).orElse(""), Optional.ofNullable( continue;
o.getString("lifespan")).orElse(""), Optional.ofNullable( }
o.getString("roomNo")).orElse( 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<ExperimentDocMapper, E
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject o = jsonArray.get(i); JSONObject o = jsonArray.get(i);
Map<String, Object> params = new HashMap<>(); Map<String, Object> 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("index", (list.size()) + "");
params.put("设备名称", Optional.ofNullable( params.put("设备名称", equipment.getName());
o.getString("equipment_name")).orElse("")); params.put("管理编号", equipment.getManagementNo());
params.put("管理编号", Optional.ofNullable(o.getString("managementNo")).orElse(""));
params.put("使用日期", experiment.getStartDate()); params.put("使用日期", experiment.getStartDate());
params.put("归还日期", experiment.getEndDate()); params.put("归还日期", experiment.getEndDate());
params.put("计量有效期", Optional.ofNullable( params.put("计量有效期", equipment.getExpireDate());
o.getString("lifespan")).orElse(""));
params.put("异常记录", ""); params.put("异常记录", "");
list.add(params); list.add(params);
} }