diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java index f9cc8a9..d5f9ba4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java @@ -71,12 +71,12 @@ public class ExperimentDeviationConditionController @Operation(summary = "试验偏置条件信息-添加") @RequiresPermissions("database:experiment:add") @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { + public Result add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!"); experimentDeviationConditionService.save(experimentDeviationCondition); - return Result.OK("添加成功!"); + return Result.OK(experimentDeviationCondition); } /** @@ -89,11 +89,11 @@ public class ExperimentDeviationConditionController @Operation(summary = "试验偏置条件信息-编辑") @RequiresPermissions("database:experiment:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { + public Result edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空!"); experimentDeviationConditionService.updateById(experimentDeviationCondition); - return Result.OK("编辑成功!"); + return Result.OK(experimentDeviationCondition); } /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java index c250101..6387630 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java @@ -77,7 +77,7 @@ public class ExperimentDeviationEquipmentController @Operation(summary = "试验加偏设备信息-添加") @RequiresPermissions("database:experiment:add") @PostMapping(value = "/add") - public Result add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { + public Result add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!"); @@ -88,7 +88,7 @@ public class ExperimentDeviationEquipmentController experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate()); } experimentDeviationEquipmentService.save(experimentDeviationEquipment); - return Result.OK("添加成功!"); + return Result.OK(experimentDeviationEquipment); } /** @@ -101,7 +101,7 @@ public class ExperimentDeviationEquipmentController @Operation(summary = "试验加偏设备信息-编辑") @RequiresPermissions("database:experiment:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { + public Result edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空!"); String equipmentNo = experimentDeviationEquipment.getManagementNo(); @@ -111,7 +111,7 @@ public class ExperimentDeviationEquipmentController experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate()); } experimentDeviationEquipmentService.updateById(experimentDeviationEquipment); - return Result.OK("编辑成功!"); + return Result.OK(experimentDeviationEquipment); } /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java index d3592ea..9ebf08a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java @@ -70,11 +70,11 @@ public class ExperimentIrradiationBoardController extends JeecgController add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { + public Result add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!"); experimentIrradiationBoardService.save(experimentIrradiationBoard); - return Result.OK("添加成功!"); + return Result.OK(experimentIrradiationBoard); } /** @@ -87,11 +87,11 @@ public class ExperimentIrradiationBoardController extends JeecgController edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { + public Result edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空!"); Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空!"); experimentIrradiationBoardService.updateById(experimentIrradiationBoard); - return Result.OK("编辑成功!"); + return Result.OK(experimentIrradiationBoard); } /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java index e8af709..09f2980 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java @@ -104,10 +104,10 @@ public class ExperimentSampleInfoController extends JeecgController add(@RequestBody ExperimentSampleInfo experimentSampleInfo) { + public Result add(@RequestBody ExperimentSampleInfo experimentSampleInfo) { Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!"); experimentSampleInfoService.save(experimentSampleInfo); - return Result.OK("添加成功!"); + return Result.ok(experimentSampleInfo); } /** @@ -120,10 +120,10 @@ public class ExperimentSampleInfoController extends JeecgController edit(@RequestBody ExperimentSampleInfo experimentSampleInfo) { + public Result edit(@RequestBody ExperimentSampleInfo experimentSampleInfo) { Assert.hasText(experimentSampleInfo.getExperimentId(), "实验ID不能为空!"); experimentSampleInfoService.updateById(experimentSampleInfo); - return Result.OK("编辑成功!"); + return Result.OK(experimentSampleInfo); } /**