Experiment edit
This commit is contained in:
@@ -71,12 +71,12 @@ public class ExperimentDeviationConditionController
|
|||||||
@Operation(summary = "试验偏置条件信息-添加")
|
@Operation(summary = "试验偏置条件信息-添加")
|
||||||
@RequiresPermissions("database:experiment:add")
|
@RequiresPermissions("database:experiment:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
public Result<ExperimentDeviationCondition> add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
||||||
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
||||||
|
|
||||||
experimentDeviationConditionService.save(experimentDeviationCondition);
|
experimentDeviationConditionService.save(experimentDeviationCondition);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK(experimentDeviationCondition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -89,11 +89,11 @@ public class ExperimentDeviationConditionController
|
|||||||
@Operation(summary = "试验偏置条件信息-编辑")
|
@Operation(summary = "试验偏置条件信息-编辑")
|
||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
public Result<ExperimentDeviationCondition> edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
|
||||||
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!");
|
||||||
experimentDeviationConditionService.updateById(experimentDeviationCondition);
|
experimentDeviationConditionService.updateById(experimentDeviationCondition);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK(experimentDeviationCondition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ public class ExperimentDeviationEquipmentController
|
|||||||
@Operation(summary = "试验加偏设备信息-添加")
|
@Operation(summary = "试验加偏设备信息-添加")
|
||||||
@RequiresPermissions("database:experiment:add")
|
@RequiresPermissions("database:experiment:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
public Result<ExperimentDeviationEquipment> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
||||||
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!");
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ public class ExperimentDeviationEquipmentController
|
|||||||
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
||||||
}
|
}
|
||||||
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK(experimentDeviationEquipment);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -101,7 +101,7 @@ public class ExperimentDeviationEquipmentController
|
|||||||
@Operation(summary = "试验加偏设备信息-编辑")
|
@Operation(summary = "试验加偏设备信息-编辑")
|
||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
public Result<ExperimentDeviationEquipment> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
||||||
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!");
|
||||||
String equipmentNo = experimentDeviationEquipment.getManagementNo();
|
String equipmentNo = experimentDeviationEquipment.getManagementNo();
|
||||||
@@ -111,7 +111,7 @@ public class ExperimentDeviationEquipmentController
|
|||||||
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
||||||
}
|
}
|
||||||
experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
|
experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK(experimentDeviationEquipment);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -70,11 +70,11 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
|
|||||||
@Operation(summary = "试验辐照板信息-添加")
|
@Operation(summary = "试验辐照板信息-添加")
|
||||||
@RequiresPermissions("database:experiment:add")
|
@RequiresPermissions("database:experiment:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
public Result<ExperimentIrradiationBoard> add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
||||||
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
||||||
experimentIrradiationBoardService.save(experimentIrradiationBoard);
|
experimentIrradiationBoardService.save(experimentIrradiationBoard);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK(experimentIrradiationBoard);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -87,11 +87,11 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
|
|||||||
@Operation(summary = "试验辐照板信息-编辑")
|
@Operation(summary = "试验辐照板信息-编辑")
|
||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
public Result<ExperimentIrradiationBoard> edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
|
||||||
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!");
|
||||||
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!");
|
||||||
experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
|
experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK(experimentIrradiationBoard);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -104,10 +104,10 @@ public class ExperimentSampleInfoController extends JeecgController<ExperimentSa
|
|||||||
@Operation(summary = "试验样品信息-添加")
|
@Operation(summary = "试验样品信息-添加")
|
||||||
@RequiresPermissions("database:experiment:add")
|
@RequiresPermissions("database:experiment:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentSampleInfo experimentSampleInfo) {
|
public Result<ExperimentSampleInfo> add(@RequestBody ExperimentSampleInfo experimentSampleInfo) {
|
||||||
Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!");
|
||||||
experimentSampleInfoService.save(experimentSampleInfo);
|
experimentSampleInfoService.save(experimentSampleInfo);
|
||||||
return Result.OK("添加成功!");
|
return Result.ok(experimentSampleInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -120,10 +120,10 @@ public class ExperimentSampleInfoController extends JeecgController<ExperimentSa
|
|||||||
@Operation(summary = "试验样品信息-编辑")
|
@Operation(summary = "试验样品信息-编辑")
|
||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody ExperimentSampleInfo experimentSampleInfo) {
|
public Result<ExperimentSampleInfo> edit(@RequestBody ExperimentSampleInfo experimentSampleInfo) {
|
||||||
Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!");
|
Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!");
|
||||||
experimentSampleInfoService.updateById(experimentSampleInfo);
|
experimentSampleInfoService.updateById(experimentSampleInfo);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK(experimentSampleInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user