diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 4f20c0a..2d3fc52 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -313,6 +313,11 @@ public class ExperimentController extends JeecgController sampleInfoList = experimentSampleInfoService.getByExperimentId(dbData.getId()); + if (CollUtil.isNotEmpty(sampleInfoList)) { + String joinStr = String.join(",", sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toSet())); + localData.setSampleModel(joinStr); + } localDatabaseService.save(localData); return Result.OK("试验已完成!"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java index 3cb2ce0..a0ae571 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java @@ -133,4 +133,11 @@ public class LocalDatabase implements Serializable { @Schema(description = "状态") private String status; + /** + * 状态 + */ + @Excel(name = "样品型号", width = 15) + @Schema(description = "样品型号") + private String sampleModel; + }