diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/exammodule/ExammoduleController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/exammodule/ExammoduleController.java index 4b18bf6..8c14584 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/exammodule/ExammoduleController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/exammodule/ExammoduleController.java @@ -81,10 +81,10 @@ public class ExammoduleController { return success(true); } @DeleteMapping("/deleteitemcode") - @Operation(summary = "按照套餐项目ID删除体检套餐项目") - public CommonResult deleteExammoduleitemcode(@RequestParam("itemCode") Integer itemCode) + @Operation(summary = "按照套餐项目ID和套餐ID删除体检套餐项目") + public CommonResult deleteExammoduleitemcode(@RequestParam("itemCode") String itemCode,@RequestParam("examModuleID") Integer ModuleID) { - exammoduleService.deleteExammoduleitemcode(itemCode); + exammoduleService.deleteExammoduleitemcode(itemCode,ModuleID); return success(true); } diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleService.java index c06cdea..3f76c59 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleService.java @@ -52,7 +52,7 @@ public interface ExammoduleService { /* * 按照体检套餐里项目ID删除数据 * */ - void deleteExammoduleitemcode(Integer itemcode); + void deleteExammoduleitemcode(String itemcode, Integer moduleid); /** * 获得体检套餐 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleServiceImpl.java index b94fe4f..1c38a1a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/exammodule/ExammoduleServiceImpl.java @@ -84,10 +84,11 @@ public class ExammoduleServiceImpl implements ExammoduleService { exammoduleMapper.delete(queryWrapper); } @Override - public void deleteExammoduleitemcode(Integer itemcode) + public void deleteExammoduleitemcode(String itemcode,Integer moduleid) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("itemCode", itemcode); + queryWrapper.eq("examModuleID", moduleid); exammoduleMapper.delete(queryWrapper); } private void validateExammoduleExists(Integer id) {