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 dc5ba3a..4b18bf6 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 @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.inspect.controller.admin.exammodule; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -50,7 +51,13 @@ public class ExammoduleController { { return success(exammoduleService.ListcreateExammodule(createReqVO)); } - + @PostMapping("/getModuleIDtems") + @Operation(summary = "根据套餐ID查询套餐下的检查项目") + public CommonResult> getModuleIDInspectitems(@RequestParam("examModuleID") Integer ModuleID) + { + List doList= exammoduleService.selectItemsByExamModuleID(ModuleID); + return success(doList); + } @PutMapping("/update") @Operation(summary = "更新体检套餐") @@ -73,6 +80,13 @@ public class ExammoduleController { exammoduleService.deleteExammoduleModuleID(ModuleID); return success(true); } + @DeleteMapping("/deleteitemcode") + @Operation(summary = "按照套餐项目ID删除体检套餐项目") + public CommonResult deleteExammoduleitemcode(@RequestParam("itemCode") Integer itemCode) + { + exammoduleService.deleteExammoduleitemcode(itemCode); + return success(true); + } @GetMapping("/get") @Operation(summary = "获得体检套餐") diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/exammodule/ExammoduleMapper.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/exammodule/ExammoduleMapper.java index 3b37fc3..fc1d06c 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/exammodule/ExammoduleMapper.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/exammodule/ExammoduleMapper.java @@ -6,9 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.inspect.dal.dataobject.exammodule.ExammoduleDO; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.inspect.controller.admin.exammodule.vo.*; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * 体检套餐 Mapper @@ -26,5 +29,7 @@ public interface ExammoduleMapper extends BaseMapperX { .eqIfPresent(ExammoduleDO::getItemCode, reqVO.getItemCode()) .orderByDesc(ExammoduleDO::getId)); } - + // 使用 @Select 注解直接写 SQL + @Select("SELECT i.* FROM tb_items i LEFT JOIN tb_exammodule e ON e.itemCode = i.itemCode WHERE e.examModuleID = #{examModuleID}") + List selectItemsByExamModuleID(@Param("examModuleID") Integer examModuleID); } \ No newline at end of file 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 04dc6ab..c06cdea 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 @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.inspect.controller.admin.exammodule.vo.*; import cn.iocoder.yudao.module.inspect.dal.dataobject.exammodule.ExammoduleDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; import javax.validation.Valid; @@ -26,6 +27,10 @@ public interface ExammoduleService { * 创建体检套餐 加项目 * **/ Boolean ListcreateExammodule(List createReqVO); + /* + * 根据套餐ID 查询套餐下面的检查项目 + * */ + List selectItemsByExamModuleID(Integer examModuleID); /** * 更新体检套餐 @@ -44,6 +49,10 @@ public interface ExammoduleService { * 按照体检套餐ID删除数据 * */ void deleteExammoduleModuleID(Integer moduleid); + /* + * 按照体检套餐里项目ID删除数据 + * */ + void deleteExammoduleitemcode(Integer itemcode); /** * 获得体检套餐 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 4fc6ddd..b94fe4f 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 @@ -53,7 +53,12 @@ public class ExammoduleServiceImpl implements ExammoduleService { List exammodule = BeanUtils.toBean(createReqVO, ExammoduleDO.class); return exammoduleMapper.insertBatch(exammodule); } - + @Override + public List selectItemsByExamModuleID(Integer examModuleID) + { + List doList= exammoduleMapper.selectItemsByExamModuleID(examModuleID); + return doList; + } @Override public void updateExammodule(ExammoduleSaveReqVO updateReqVO) { @@ -78,7 +83,13 @@ public class ExammoduleServiceImpl implements ExammoduleService { queryWrapper.eq("examModuleID", moduleid); exammoduleMapper.delete(queryWrapper); } - + @Override + public void deleteExammoduleitemcode(Integer itemcode) + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("itemCode", itemcode); + exammoduleMapper.delete(queryWrapper); + } private void validateExammoduleExists(Integer id) { if (exammoduleMapper.selectById(id) == null) {