Experiment edit
This commit is contained in:
@@ -8,6 +8,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
@@ -73,9 +75,17 @@ public class ExperimentDeviationConditionController
|
||||
@PostMapping(value = "/add")
|
||||
public Result<ExperimentDeviationCondition> add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
||||
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
||||
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
||||
|
||||
experimentDeviationConditionService.save(experimentDeviationCondition);
|
||||
String sampleId = experimentDeviationCondition.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentDeviationCondition cloned = ObjectUtils.clone(experimentDeviationCondition);
|
||||
cloned.setSampleId(id);
|
||||
experimentDeviationConditionService.save(experimentDeviationCondition);
|
||||
}
|
||||
} else {
|
||||
experimentDeviationConditionService.save(experimentDeviationCondition);
|
||||
}
|
||||
return Result.OK(experimentDeviationCondition);
|
||||
}
|
||||
|
||||
@@ -91,8 +101,18 @@ public class ExperimentDeviationConditionController
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<ExperimentDeviationCondition> edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
||||
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
||||
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
||||
experimentDeviationConditionService.updateById(experimentDeviationCondition);
|
||||
String sampleId = experimentDeviationCondition.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentDeviationCondition cloned = ObjectUtils.clone(experimentDeviationCondition);
|
||||
cloned.setSampleId(id);
|
||||
experimentDeviationConditionService.saveOrUpdate(experimentDeviationCondition);
|
||||
}
|
||||
} else {
|
||||
experimentDeviationConditionService.updateById(experimentDeviationCondition);
|
||||
}
|
||||
|
||||
return Result.OK(experimentDeviationCondition);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
@@ -87,7 +88,17 @@ public class ExperimentDeviationEquipmentController
|
||||
experimentDeviationEquipment.setEquipmentId(equipment.getId());
|
||||
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
||||
}
|
||||
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
||||
String sampleId = experimentDeviationEquipment.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);
|
||||
cloned.setSampleId(id);
|
||||
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
||||
}
|
||||
} else {
|
||||
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
||||
}
|
||||
return Result.OK(experimentDeviationEquipment);
|
||||
}
|
||||
|
||||
@@ -103,14 +114,23 @@ public class ExperimentDeviationEquipmentController
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<ExperimentDeviationEquipment> edit(@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());
|
||||
}
|
||||
experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
|
||||
String sampleId = experimentDeviationEquipment.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);
|
||||
cloned.setSampleId(id);
|
||||
experimentDeviationEquipmentService.saveOrUpdate(experimentDeviationEquipment);
|
||||
}
|
||||
} else {
|
||||
experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
|
||||
}
|
||||
return Result.OK(experimentDeviationEquipment);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
@@ -72,8 +74,17 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
|
||||
@PostMapping(value = "/add")
|
||||
public Result<ExperimentIrradiationBoard> add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
||||
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
||||
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
||||
experimentIrradiationBoardService.save(experimentIrradiationBoard);
|
||||
String sampleId = experimentIrradiationBoard.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentIrradiationBoard cloned = ObjectUtils.clone(experimentIrradiationBoard);
|
||||
cloned.setSampleId(id);
|
||||
experimentIrradiationBoardService.save(experimentIrradiationBoard);
|
||||
}
|
||||
} else {
|
||||
experimentIrradiationBoardService.save(experimentIrradiationBoard);
|
||||
}
|
||||
return Result.OK(experimentIrradiationBoard);
|
||||
}
|
||||
|
||||
@@ -89,8 +100,17 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<ExperimentIrradiationBoard> edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
||||
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
||||
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
||||
experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
|
||||
String sampleId = experimentIrradiationBoard.getSampleId();
|
||||
Assert.hasText(sampleId, "样品ID不能为空!");
|
||||
if (StringUtils.contains(sampleId, ",")) {
|
||||
for (String id : sampleId.split(",")) {
|
||||
ExperimentIrradiationBoard cloned = ObjectUtils.clone(experimentIrradiationBoard);
|
||||
cloned.setSampleId(id);
|
||||
experimentIrradiationBoardService.saveOrUpdate(experimentIrradiationBoard);
|
||||
}
|
||||
} else {
|
||||
experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
|
||||
}
|
||||
return Result.OK(experimentIrradiationBoard);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user