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-04-16 23:15:21 +08:00
parent 591ec931f1
commit ad7071a2c4
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -313,6 +313,11 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
localData.setStatus(ExperimentStatus.COMPLETED); localData.setStatus(ExperimentStatus.COMPLETED);
localData.setExperimentNo(dbData.getExperimentNo()); localData.setExperimentNo(dbData.getExperimentNo());
localData.setExperimentId(dbData.getId()); localData.setExperimentId(dbData.getId());
List<ExperimentSampleInfo> 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); localDatabaseService.save(localData);
return Result.OK("试验已完成!"); return Result.OK("试验已完成!");
} }

7
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java
View File

@@ -133,4 +133,11 @@ public class LocalDatabase implements Serializable {
@Schema(description = "状态") @Schema(description = "状态")
private String status; private String status;
/**
* 状态
*/
@Excel(name = "样品型号", width = 15)
@Schema(description = "样品型号")
private String sampleModel;
} }