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 13:47:44 +08:00
parent d7d22f058f
commit 20a774f842
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -499,7 +499,7 @@ 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( strings.add(new String[] {(strings.size()) + "", Optional.ofNullable(
o.getString("equipment_name")).orElse(""), o.getString("equipment_name")).orElse(""),
Optional.ofNullable(o.getString("managementNo")).orElse(""), Optional.ofNullable( Optional.ofNullable(o.getString("managementNo")).orElse(""), Optional.ofNullable(
o.getString("lifespan")).orElse(""), Optional.ofNullable( o.getString("lifespan")).orElse(""), Optional.ofNullable(
@@ -558,6 +558,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
private Map<String, Object> assembleSbsyjlb(String experimentId) { private Map<String, Object> assembleSbsyjlb(String experimentId) {
List<ExperimentDeviationEquipment> equipmentList = experimentDeviationEquipmentService.getByExperimentId(experimentId); List<ExperimentDeviationEquipment> equipmentList = experimentDeviationEquipmentService.getByExperimentId(experimentId);
Experiment experiment = experimentService.getById(experimentId); Experiment experiment = experimentService.getById(experimentId);
experimentService.fetchExperimentDetail(experiment);
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < equipmentList.size(); i++) { for (int i = 0; i < equipmentList.size(); i++) {
ExperimentDeviationEquipment v = equipmentList.get(i); ExperimentDeviationEquipment v = equipmentList.get(i);
@@ -572,6 +573,31 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
params.put("异常记录", ""); params.put("异常记录", "");
list.add(params); list.add(params);
} }
List<ExperimentTestProcess> experimentTestProcesses = experimentTestProcessService.getByExperimentId(experiment.getId());
if (CollUtil.isNotEmpty(experimentTestProcesses)) {
for (ExperimentTestProcess experimentTestProcess : experimentTestProcesses) {
String testEquipment = experimentTestProcess.getTestEquipment();
if (StringUtils.isNotBlank(testEquipment)) {
List<JSONObject> jsonArray = JSON.parseArray(testEquipment, JSONObject.class);
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject o = jsonArray.get(i);
Map<String, Object> params = new HashMap<>();
params.put("index", (list.size()) + "");
params.put("设备名称", Optional.ofNullable(
o.getString("equipment_name")).orElse(""));
params.put("管理编号", Optional.ofNullable(o.getString("managementNo")).orElse(""));
params.put("使用日期", experiment.getStartDate());
params.put("归还日期", experiment.getEndDate());
params.put("计量有效期", Optional.ofNullable(
o.getString("lifespan")).orElse(""));
params.put("异常记录", "");
list.add(params);
}
}
}
}
Map<String, Object> root = new HashMap<>(); Map<String, Object> root = new HashMap<>();
root.put("equipment", list); root.put("equipment", list);