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-10 00:02:55 +08:00
parent 8750c279eb
commit 087c5d688b
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,16 +80,14 @@ public class ExperimentDeviationEquipmentController
@PostMapping(value = "/add")
public Result<ExperimentDeviationEquipment> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空！");
Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空！");
String equipmentNo = experimentDeviationEquipment.getManagementNo();
if (StringUtils.isNotBlank(equipmentNo) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
Equipment equipment = equipmentService.getByManagementNo(equipmentNo);
experimentDeviationEquipment.setEquipmentId(equipment.getId());
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
}
String sampleId = experimentDeviationEquipment.getSampleId();
Assert.hasText(sampleId, "样品ID不能为空！");
String equipmentId = experimentDeviationEquipment.getEquipmentId();
if (StringUtils.isNotBlank(equipmentId) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
Equipment equipment = equipmentService.getById(equipmentId);
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
}
if (StringUtils.contains(sampleId, ",")) {
for (String id : sampleId.split(",")) {
ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);
@@ -114,14 +112,14 @@ public class ExperimentDeviationEquipmentController
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<ExperimentDeviationEquipment> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空！");
String equipmentNo = experimentDeviationEquipment.getManagementNo();
if (StringUtils.isNotBlank(equipmentNo) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
Equipment equipment = equipmentService.getByManagementNo(equipmentNo);
experimentDeviationEquipment.setEquipmentId(equipment.getId());
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
}
String sampleId = experimentDeviationEquipment.getSampleId();
Assert.hasText(sampleId, "样品ID不能为空！");
String equipmentId = experimentDeviationEquipment.getEquipmentId();
if (StringUtils.isNotBlank(equipmentId) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
Equipment equipment = equipmentService.getById(equipmentId);
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
}
if (StringUtils.contains(sampleId, ",")) {
for (String id : sampleId.split(",")) {
ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);