diff --git a/ruoyi-ui/src/views/benyi/themeweekplan/data.vue b/ruoyi-ui/src/views/benyi/themeweekplan/data.vue index c2763d1d7..a0f7f5161 100644 --- a/ruoyi-ui/src/views/benyi/themeweekplan/data.vue +++ b/ruoyi-ui/src/views/benyi/themeweekplan/data.vue @@ -102,7 +102,7 @@ v-show="isShow" >填充 - 删除 + > --> 填充 - 删除 + > --> diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java index 12744d3a9..7d0d50c30 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java @@ -112,11 +112,11 @@ public class ByThemeWeekplanController extends BaseController { @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - AjaxResult ajax=AjaxResult.success(); - ByThemeWeekplan byThemeWeekplan=byThemeWeekplanService.selectByThemeWeekplanById(id); + AjaxResult ajax = AjaxResult.success(); + ByThemeWeekplan byThemeWeekplan = byThemeWeekplanService.selectByThemeWeekplanById(id); ajax.put(AjaxResult.DATA_TAG, byThemeWeekplan); - ajax.put("classname",byClassService.selectByClassById(byThemeWeekplan.getClassid()).getBjmc()); - ajax.put("createusername",userService.selectUserById(byThemeWeekplan.getCreateuserid()).getNickName()); + ajax.put("classname", byClassService.selectByClassById(byThemeWeekplan.getClassid()).getBjmc()); + ajax.put("createusername", userService.selectUserById(byThemeWeekplan.getCreateuserid()).getNickName()); return ajax; } @@ -134,7 +134,7 @@ public class ByThemeWeekplanController extends BaseController { String bjtypeNew = byClassService.selectByClassById(classId).getBjtype(); if (bjtypeNew.equals("1")) { return AjaxResult.error("当前班级为托班,无法创建计划"); - }else { + } else { //判断当前班级是否创建月计划 ByThemeMonthplan byThemeMonthplan = new ByThemeMonthplan(); byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); @@ -224,6 +224,10 @@ public class ByThemeWeekplanController extends BaseController { @Log(title = "主题整合周计划(根据月计划明细)", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { + //先删除子项 + for (int i = 0; i < ids.length; i++) { + byThemeWeekplanitemService.deleteByThemeWeekplanitemByPId(ids[i]); + } return toAjax(byThemeWeekplanService.deleteByThemeWeekplanByIds(ids)); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java index 5d93b13f4..afd4f4d24 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java @@ -58,4 +58,12 @@ public interface ByThemeWeekplanitemMapper { * @return 结果 */ public int deleteByThemeWeekplanitemByIds(Long[] ids); + + /** + * 删除主题整合周计划明细信息 + * + * @param pid 主题周计划主键 + * @return 结果 + */ + public int deleteByThemeWeekplanitemByPId(String pid); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java index 5aba4a0b4..066159d82 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java @@ -58,4 +58,13 @@ public interface IByThemeWeekplanitemService { * @return 结果 */ public int deleteByThemeWeekplanitemById(Long id); + + + /** + * 删除主题整合周计划明细信息 + * + * @param pid 主题周计划主键 + * @return 结果 + */ + public int deleteByThemeWeekplanitemByPId(String pid); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java index 7462aa791..91574efb0 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java @@ -87,4 +87,15 @@ public class ByThemeWeekplanitemServiceImpl implements IByThemeWeekplanitemServi public int deleteByThemeWeekplanitemById(Long id) { return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemById(id); } + + /** + * 删除主题整合周计划明细信息 + * + * @param pid 主题周计划主键 + * @return 结果 + */ + @Override + public int deleteByThemeWeekplanitemByPId(String pid) { + return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemByPId(pid); + } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml index 661e12a8b..43a9b3364 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml @@ -92,6 +92,10 @@ delete from by_theme_weekplanitem where id = #{id} + + delete from by_theme_weekplanitem where wpid = #{wpid} + + delete from by_theme_weekplanitem where id in