From 64471c4c8bc567f3cc7f926d8bf988f7ee20224a Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sun, 5 Sep 2021 16:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=AD=90=E9=A1=B9?=
=?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/benyi/themeweekplan/data.vue | 8 ++++----
.../controller/ByThemeWeekplanController.java | 14 +++++++++-----
.../benyi/mapper/ByThemeWeekplanitemMapper.java | 8 ++++++++
.../benyi/service/IByThemeWeekplanitemService.java | 9 +++++++++
.../impl/ByThemeWeekplanitemServiceImpl.java | 11 +++++++++++
.../mybatis/benyi/ByThemeWeekplanitemMapper.xml | 4 ++++
6 files changed, 45 insertions(+), 9 deletions(-)
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"
>填充</el-button
>
- <el-button
+ <!-- <el-button
type="danger"
icon="el-icon-delete"
size="mini"
@@ -111,7 +111,7 @@
v-hasPermi="['benyi:themeweekplan:remove']"
v-show="isShow"
>删除</el-button
- >
+ > -->
</div>
<el-table
@@ -168,7 +168,7 @@
v-show="isShow"
>填充</el-button
>
- <el-button
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@@ -176,7 +176,7 @@
v-hasPermi="['benyi:themeweekplan:remove']"
v-show="isShow"
>删除</el-button
- >
+ > -->
</template>
</el-table-column>
</el-table>
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>
+ <delete id="deleteByThemeWeekplanitemByPId" parameterType="String">
+ delete from by_theme_weekplanitem where wpid = #{wpid}
+ </delete>
+
<delete id="deleteByThemeWeekplanitemByIds" parameterType="String">
delete from by_theme_weekplanitem where id in
<foreach item="id" collection="array" open="(" separator="," close=")">