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 09f2980..1a6d784 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 @@ -15,7 +15,7 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.modules.database.entity.ExperimentSampleInfo; -import org.jeecg.modules.database.service.IExperimentSampleInfoService; +import org.jeecg.modules.database.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -35,7 +35,13 @@ import java.util.*; @Slf4j public class ExperimentSampleInfoController extends JeecgController { @Autowired - private IExperimentSampleInfoService experimentSampleInfoService; + private IExperimentSampleInfoService experimentSampleInfoService; + @Autowired + private IExperimentDeviationEquipmentService experimentDeviationEquipmentService; + @Autowired + private IExperimentDeviationConditionService experimentDeviationConditionService; + @Autowired + private IExperimentIrradiationBoardService experimentIrradiationBoardService; /** * 分页列表查询 @@ -138,6 +144,9 @@ public class ExperimentSampleInfoController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { experimentSampleInfoService.removeById(id); + experimentDeviationEquipmentService.removeBySampleId(id); + experimentDeviationConditionService.removeBySampleId(id); + experimentIrradiationBoardService.removeBySampleId(id); return Result.OK("删除成功!"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java index f4f0106..fa61255 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java @@ -26,12 +26,6 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl