From 7d44e1650df540ee4acea3600c5772265fc5203d Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sat, 4 Sep 2021 22:05:25 +0800 Subject: [PATCH 01/19] =?UTF-8?q?ios=E6=97=A5=E6=9C=9F=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E5=91=A8=E8=AE=A1=E5=88=92=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=BB=E9=A2=98=20=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=BE=E7=A8=8B=E6=A0=91?= =?UTF-8?q?=E6=8A=98=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/ruoyi.js | 2 +- .../views/benyi/themestudy_tremplan/index.vue | 2 +- .../ByThemeMonthplanController.java | 25 ++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index bbf4fb2ed..ebae65292 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -18,7 +18,7 @@ export function parseTime(time, pattern) { if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { time = parseInt(time) } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/'); + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),''); } if ((typeof time === 'number') && (time.toString().length === 10)) { time = time * 1000 diff --git a/ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue b/ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue index e489b3aca..f77040aa8 100644 --- a/ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue +++ b/ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue @@ -19,7 +19,7 @@ :expand-on-click-node="true" :filter-node-method="filterNode" ref="tree" - default-expand-all + :default-expand-all="false" @node-click="handleNodeClick" /> diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java index ab12c759b..0c60c4685 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java @@ -63,11 +63,18 @@ public class ByThemeMonthplanController extends BaseController { @GetMapping("/list") public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) { byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); - String classId = schoolCommon.getClassId(); + //参数传进来的班级编号 + String strClassId = byThemeMonthplan.getClassid(); List list = null; - //首先判断当前账户是否为幼儿园账号 - if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) { - byThemeMonthplan.setClassid(classId); + //如果传进来的班级编号为空，那么就认为是本身查询 + if (schoolCommon.isStringEmpty(strClassId)) { + String classId = schoolCommon.getClassId(); + //首先判断当前账户是否为幼儿园账号 + if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) { + byThemeMonthplan.setClassid(classId); + } + }else{ + byThemeMonthplan.setClassid(strClassId); } startPage(); list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan); @@ -105,11 +112,11 @@ public class ByThemeMonthplanController extends BaseController { @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - AjaxResult ajax=AjaxResult.success(); - ByThemeMonthplan byThemeMonthplan=byThemeMonthplanService.selectByThemeMonthplanById(id); + AjaxResult ajax = AjaxResult.success(); + ByThemeMonthplan byThemeMonthplan = byThemeMonthplanService.selectByThemeMonthplanById(id); ajax.put(AjaxResult.DATA_TAG, byThemeMonthplan); - ajax.put("classname",byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc()); - ajax.put("createusername",userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName()); + ajax.put("classname", byClassService.selectByClassById(byThemeMonthplan.getClassid()).getBjmc()); + ajax.put("createusername", userService.selectUserById(byThemeMonthplan.getCreateuserid()).getNickName()); return ajax; } @@ -127,7 +134,7 @@ public class ByThemeMonthplanController extends BaseController { String bjtypeNew = byClassService.selectByClassById(classId).getBjtype(); if (bjtypeNew.equals("1")) { return AjaxResult.error("当前班级为托班，无法创建计划"); - }else { + } else { //根据当前月份 查找学期计划的主题 ByThemeTermplan byThemeTermplan = new ByThemeTermplan(); byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); From 8f8152bc2a8a22923b8f41689fa6d55452c73337 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sat, 4 Sep 2021 22:31:06 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8D=95ID=20=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml index 01b5f1dc0..c6e8d2250 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByTrainVideoMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and classtype = #{classtype} and createuserid = #{createuserid} and createtime = #{createtime} + and id = #{id} From 6be58b8009015540408757b139fb03640368f38d Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sun, 5 Sep 2021 14:35:15 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/benyi/planweek/table.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/planweek/table.vue b/ruoyi-ui/src/views/benyi/planweek/table.vue index 1c3349948..5aef4bd66 100644 --- a/ruoyi-ui/src/views/benyi/planweek/table.vue +++ b/ruoyi-ui/src/views/benyi/planweek/table.vue @@ -43,20 +43,20 @@ 健康 - - 语言 + + 语言 - - 社会 + + 社会 - - 科学 + + 科学 - - 艺术 + + 艺术 From 8f15e3db759b4f827b6724e038594637b2f23d9d Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sun, 5 Sep 2021 14:58:34 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/benyi/controller/ByMathTermplanController.java | 2 +- .../project/benyi/controller/ByThemeMonthplanController.java | 2 +- .../project/benyi/controller/ByThemeTermplanController.java | 2 +- .../project/benyi/controller/ByThemeWeekplanController.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java index 8ff0a91a7..e33f9a148 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java @@ -144,7 +144,7 @@ public class ByMathTermplanController extends BaseController { return toAjax(byMathTermplanService.insertByMathTermplan(byMathTermplan)); } } else { - return AjaxResult.error("当前用户非幼儿园教师，无法创建计划"); + return AjaxResult.error("当前用户非幼儿园班级教师，无法创建计划"); } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java index 0c60c4685..22326c6e4 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java @@ -178,7 +178,7 @@ public class ByThemeMonthplanController extends BaseController { return toAjax(byThemeMonthplanService.insertByThemeMonthplan(byThemeMonthplan)); } } else { - return AjaxResult.error("当前用户非幼儿园教师，无法创建月计划"); + return AjaxResult.error("当前用户非幼儿园班级教师，无法创建月计划"); } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java index 69cbba755..4b37c018f 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java @@ -151,7 +151,7 @@ public class ByThemeTermplanController extends BaseController { } } } else { - return AjaxResult.error("当前用户非幼儿园教师，无法创建计划"); + return AjaxResult.error("当前用户非幼儿园班级教师，无法创建计划"); } } 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 b001febef..12744d3a9 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 @@ -203,7 +203,7 @@ public class ByThemeWeekplanController extends BaseController { return toAjax(byThemeWeekplanService.insertByThemeWeekplan(byThemeWeekplan)); } } else { - return AjaxResult.error("当前用户非幼儿园教师，无法创建周计划"); + return AjaxResult.error("当前用户非幼儿园班级教师，无法创建周计划"); } } From 54518511d26345c331427cb779c4cbd3056904bc Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sun, 5 Sep 2021 16:11:00 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9C=88=E8=AE=A1=E5=88=92=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/benyi/thememonthplan/index.vue | 2 +- ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue | 2 +- .../project/benyi/controller/ByThemeMonthplanController.java | 2 -- .../src/main/resources/mybatis/benyi/ByThemeMonthplanMapper.xml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue index 38d4396ac..491ff69cf 100644 --- a/ruoyi-ui/src/views/benyi/thememonthplan/index.vue +++ b/ruoyi-ui/src/views/benyi/thememonthplan/index.vue @@ -45,7 +45,7 @@ - + - + and a.classid = #{classid} and a.xnxq = #{xnxq} and a.month = #{month} - and a.themes = #{themes} + and a.themes like concat('%;', #{themes}, ';%') and a.selfthemes = #{selfthemes} and a.wxkc = #{wxkc} and a.support = #{support} From 64471c4c8bc567f3cc7f926d8bf988f7ee20224a Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sun, 5 Sep 2021 16:53:26 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=AD=90?= =?UTF-8?q?=E9=A1=B9=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" >填充 - 删除 + > --> 填充 - 删除 + > --> 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 From 3d35107e249008c113ea7b9996cecc39c6e1418a Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Sun, 5 Sep 2021 17:34:58 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=AD=90?= =?UTF-8?q?=E9=A1=B9=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 --- .../benyi/controller/ByThemeMonthplanitemController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanitemController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanitemController.java index 7f6a52cb7..3bcf64c0d 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanitemController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanitemController.java @@ -52,7 +52,7 @@ public class ByThemeMonthplanitemController extends BaseController { * 导出主题整合周计划列表 */ @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:export')") - @Log(title = "主题整合周计划", businessType = BusinessType.EXPORT) + @Log(title = "主题整合月计划", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ByThemeMonthplanitem byThemeMonthplanitem) { List list = byThemeWeekplanService.selectByThemeMonthplanitemList(byThemeMonthplanitem); @@ -73,7 +73,7 @@ public class ByThemeMonthplanitemController extends BaseController { * 新增主题整合周计划 */ @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:add')") - @Log(title = "主题整合周计划", businessType = BusinessType.INSERT) + @Log(title = "主题整合月计划", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ByThemeMonthplanitem byThemeMonthplanitem) { String uuid = schoolCommon.getUuid(); @@ -86,7 +86,7 @@ public class ByThemeMonthplanitemController extends BaseController { * 修改主题整合周计划 */ @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:edit')") - @Log(title = "主题整合周计划", businessType = BusinessType.UPDATE) + @Log(title = "主题整合月计划", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ByThemeMonthplanitem byThemeMonthplanitem) { return toAjax(byThemeWeekplanService.updateByThemeMonthplanitem(byThemeMonthplanitem)); @@ -96,7 +96,7 @@ public class ByThemeMonthplanitemController extends BaseController { * 删除主题整合周计划 */ @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:remove')") - @Log(title = "主题整合周计划", businessType = BusinessType.DELETE) + @Log(title = "主题整合月计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { return toAjax(byThemeWeekplanService.deleteByThemeMonthplanitemByIds(ids)); From 284602e4acb217fa0ca8f2cbac984ffe5723abd2 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 6 Sep 2021 11:33:39 +0800 Subject: [PATCH 08/19] =?UTF-8?q?1=E3=80=81=E6=9C=88=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=AD=90=E9=A1=B9=202?= =?UTF-8?q?=E3=80=81=E5=BE=AE=E5=9E=8B=E8=AF=BE=E7=A8=8B=20=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/benyi/microcoursestudy/index.vue | 58 ++++++++++++++++--- .../src/views/benyi/thememonthplan/data.vue | 30 ++++++---- .../ByThemeMonthplanController.java | 11 ++++ 3 files changed, 78 insertions(+), 21 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue index ba9575778..901f2c384 100644 --- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue +++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue @@ -36,8 +36,18 @@ size="mini" icon="el-icon-printer" @click="prints" + v-show="enable" >打印 + 复制
@@ -48,11 +58,14 @@ @@ -160,20 +200,20 @@ export default { line-height: 40px; } // 禁止复制 -div { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} +// div { +// -webkit-touch-callout: none; +// -webkit-user-select: none; +// -khtml-user-select: none; +// -moz-user-select: none; +// -ms-user-select: none; +// user-select: none; +// } .el-tree { min-width: 100%; display: inline-block; } .tree { - overflow:auto; + overflow: auto; max-height: 600px; } \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/thememonthplan/data.vue b/ruoyi-ui/src/views/benyi/thememonthplan/data.vue index cc7f9bfe3..e28a416b3 100644 --- a/ruoyi-ui/src/views/benyi/thememonthplan/data.vue +++ b/ruoyi-ui/src/views/benyi/thememonthplan/data.vue @@ -466,19 +466,25 @@ export default { this.open = true; this.title = "填充主题整合周计划明细"; let arrTime = []; - arrTime.push(response.data.starttime); - arrTime.push(response.data.endtime); + if (response.data.starttime == null) { + } else { + arrTime.push(response.data.starttime); + arrTime.push(response.data.endtime); + } this.form.starttime = arrTime; - var activityid = response.data.activityid.split(";"); - var array = []; - //console.log(arr); - activityid.forEach(function (value, key, arr) { - //console.log(value); // 结果依次为1，2，3 - if (value != "") { - array.push(parseInt(value)); - } - }); - this.themeactivityList = array; + if (activityid == null) { + } else { + var activityid = response.data.activityid.split(";"); + var array = []; + //console.log(arr); + activityid.forEach(function (value, key, arr) { + //console.log(value); // 结果依次为1，2，3 + if (value != "") { + array.push(parseInt(value)); + } + }); + this.themeactivityList = array; + } }); }, /** 提交按钮 */ diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java index 18ebee792..606bcd543 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java @@ -173,6 +173,17 @@ public class ByThemeMonthplanController extends BaseController { byThemeMonthplan.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); byThemeMonthplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-主题整合月计划" + "(" + sdf.format(byThemeMonthplan.getMonth()) + ")"); + + // 默认创建4个周内容项，如果当前月份5个周 那么由用户自己删 或 增 + ByThemeMonthplanitem byThemeMonthplanitem=null; + for(int i=1;i<5;i++){ + byThemeMonthplanitem=new ByThemeMonthplanitem(); + byThemeMonthplanitem.setId(schoolCommon.getUuid()); + byThemeMonthplanitem.setMpid(uuid); + byThemeMonthplanitem.setZc(Long.valueOf(i)); + byThemeonthplanitemService.insertByThemeMonthplanitem(byThemeMonthplanitem); + } + return toAjax(byThemeMonthplanService.insertByThemeMonthplan(byThemeMonthplan)); } } else { From bb7b155dbe49026edd8e437e421fb3f9db669944 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 6 Sep 2021 18:30:44 +0800 Subject: [PATCH 09/19] =?UTF-8?q?1=E3=80=81=E5=91=A8=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=89=93=E5=8D=B0=202=E3=80=81=E5=BE=AE?= =?UTF-8?q?=E5=9E=8B=E8=AF=BE=E7=A8=8B=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/router/index.js | 19 +- .../views/benyi/microcoursestudy/index.vue | 2 - .../views/benyi/themestudy_weekplan/index.vue | 349 ++++++++++++++++++ .../src/views/benyi/themeweekplan/table.vue | 9 +- 4 files changed, 372 insertions(+), 7 deletions(-) create mode 100644 ruoyi-ui/src/views/benyi/themestudy_weekplan/index.vue diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a05e0588e..88298ae74 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -313,6 +313,22 @@ export const constantRoutes = [ } ] }, + { + path: "/benyi_course/weekplan", + component: Layout, + hidden: true, + children: [ + { + path: "themestudy/:id(\\d+)/:wid(\\d+)", + component: () => import("@/views/benyi/themestudy_weekplan"), + name: "Theme3", + meta: { + title: "主题整合周计划详情", + icon: "" + } + } + ] + }, { path: "/benyi_course/mathtermplan", component: Layout, @@ -480,7 +496,8 @@ export const constantRoutes = [ children: [ { path: "approval/:id", - component: () => import("@/views/benyi/thememonthplanapproval/approval"), + component: () => + import("@/views/benyi/thememonthplanapproval/approval"), name: "ThememonthplanApproval", meta: { title: "主题整合月计划审批", diff --git a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue index 901f2c384..843bd03b4 100644 --- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue +++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue @@ -58,8 +58,6 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/themeweekplan/table.vue b/ruoyi-ui/src/views/benyi/themeweekplan/table.vue index 651377373..f8f5869ba 100644 --- a/ruoyi-ui/src/views/benyi/themeweekplan/table.vue +++ b/ruoyi-ui/src/views/benyi/themeweekplan/table.vue @@ -58,9 +58,9 @@ {{ themeactivityFormat(index) }} @@ -102,7 +102,7 @@ export default { data() { return { //url - url: "/benyi_course/tremplan/themestudy/", + url: "/benyi_course/weekplan/themestudy/", tableData: [], title: "", zc: "", @@ -287,6 +287,7 @@ export default { async getList() { //console.log(this.queryParams.wpid); await listWeekplanitem(this.queryParams).then((response) => { + //console.log(response.rows); this.bodyData.weekplanitemList = response.rows; //获取所有的活动id From 4fbe05ab208e56c1059419c560eddb44bca5ba76 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Wed, 8 Sep 2021 10:35:48 +0800 Subject: [PATCH 10/19] =?UTF-8?q?ios=20=E5=B9=B4=E6=9C=88=20=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/index.js | 26 +++-- ruoyi-ui/src/utils/ruoyi.js | 220 ++++++++++++++++++++---------------- 2 files changed, 136 insertions(+), 110 deletions(-) diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js index 6c3017c76..2893bc83a 100644 --- a/ruoyi-ui/src/utils/index.js +++ b/ruoyi-ui/src/utils/index.js @@ -1,3 +1,5 @@ +import { parseTime } from './ruoyi' + /** * 表格时间格式化 */ @@ -124,19 +126,21 @@ export function param(json) { * @returns {Object} */ export function param2Obj(url) { - const search = url.split('?')[1] + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') if (!search) { return {} } - return JSON.parse( - '{"' + - decodeURIComponent(search) - .replace(/"/g, '\\"') - .replace(/&/g, '","') - .replace(/=/g, '":"') - .replace(/\+/g, ' ') + - '"}' - ) + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj } /** @@ -383,4 +387,4 @@ export function camelCase(str) { export function isNumberStr(str) { return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) } - \ No newline at end of file + diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index ebae65292..bbdbde8dd 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -3,117 +3,140 @@ * Copyright (c) 2019 ruoyi */ -const baseURL = process.env.VUE_APP_BASE_API +const baseURL = process.env.VUE_APP_BASE_API; // 日期格式化 export function parseTime(time, pattern) { - if (arguments.length === 0 || !time) { - return null - } - const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),''); - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str + if (arguments.length === 0 || !time) { + return null; + } + //console.log(time, pattern); + const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}"; + //console.log(format); + let date; + //console.log(typeof time); + if (typeof time === "object") { + date = time; + } else { + if (typeof time === "string" && /^[0-9]+$/.test(time)) { + time = parseInt(time); + //console.log("1:" + time); + } else if (typeof time === "string") { + time = time + .replace(new RegExp(/-/gm), "/") + .replace("T", " ") + .replace(new RegExp(/\.[\d]{3}/gm), ""); + + if (time.length == 7) { + time = time + "/01"; + } + //console.log(time); + } + if (typeof time === "number" && time.toString().length === 10) { + time = time * 1000; + } + date = new Date(time); + } + //console.log(date); + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + }; + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key]; + // Note: getDay() returns 0 on Sunday + if (key === "a") { + return ["日", "一", "二", "三", "四", "五", "六"][value]; + } + if (result.length > 0 && value < 10) { + value = "0" + value; + } + return value || 0; + }); + //console.log(time_str); + return time_str; } // 表单重置 export function resetForm(refName) { - if (this.$refs[refName]) { - this.$refs[refName].resetFields(); - } + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } } // 添加日期范围 export function addDateRange(params, dateRange) { - var search = params; - search.beginTime = ""; - search.endTime = ""; - if (null != dateRange && '' != dateRange) { - search.beginTime = this.dateRange[0]; - search.endTime = this.dateRange[1]; - } - return search; + var search = params; + search.beginTime = ""; + search.endTime = ""; + if (null != dateRange && "" != dateRange) { + search.beginTime = this.dateRange[0]; + search.endTime = this.dateRange[1]; + } + return search; } // 回显数据字典 export function selectDictLabel(datas, value) { - var actions = []; - Object.keys(datas).map((key) => { - if (datas[key].dictValue == ('' + value)) { - actions.push(datas[key].dictLabel); - return false; - } - }) - return actions.join(''); + var actions = []; + Object.keys(datas).map(key => { + if (datas[key].dictValue == "" + value) { + actions.push(datas[key].dictLabel); + return false; + } + }); + return actions.join(""); } // 回显数据字典 export function selectMoeDictLabel(datas, value) { - var actions = []; - Object.keys(datas).map((key) => { - if (datas[key].id == ('' + value)) { - actions.push(datas[key].name); - return false; - } - }) - return actions.join(''); + var actions = []; + Object.keys(datas).map(key => { + if (datas[key].id == "" + value) { + actions.push(datas[key].name); + return false; + } + }); + return actions.join(""); } // 通用下载方法 export function download(fileName) { - window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; + window.location.href = + baseURL + + "/common/download?fileName=" + + encodeURI(fileName) + + "&delete=" + + true; } // 字符串格式化(%s ) export function sprintf(str) { - var args = arguments, flag = true, i = 1; - str = str.replace(/%s/g, function () { - var arg = args[i++]; - if (typeof arg === 'undefined') { - flag = false; - return ''; - } - return arg; - }); - return flag ? str : ''; + var args = arguments, + flag = true, + i = 1; + str = str.replace(/%s/g, function() { + var arg = args[i++]; + if (typeof arg === "undefined") { + flag = false; + return ""; + } + return arg; + }); + return flag ? str : ""; } // 转换字符串，undefined,null等转化为"" export function praseStrEmpty(str) { - if (!str || str == "undefined" || str == "null") { - return ""; - } - return str; + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; } /** @@ -125,22 +148,21 @@ export function praseStrEmpty(str) { * @param {*} rootId 根Id 默认 0 */ export function handleTree(data, id, parentId, children, rootId) { - id = id || 'id' - parentId = parentId || 'parentId' - children = children || 'children' - rootId = rootId || 0 - //对源数据深度克隆 - const cloneData = JSON.parse(JSON.stringify(data)) - //循环所有项 - const treeData = cloneData.filter(father => { - let branchArr = cloneData.filter(child => { - //返回每一项的子级数组 - return father[id] === child[parentId] - }); - branchArr.length > 0 ? father.children = branchArr : ''; - //返回第一层 - return father[parentId] === rootId; - }); - return treeData != '' ? treeData : data; - } - \ No newline at end of file + id = id || "id"; + parentId = parentId || "parentId"; + children = children || "children"; + rootId = rootId || 0; + //对源数据深度克隆 + const cloneData = JSON.parse(JSON.stringify(data)); + //循环所有项 + const treeData = cloneData.filter(father => { + let branchArr = cloneData.filter(child => { + //返回每一项的子级数组 + return father[id] === child[parentId]; + }); + branchArr.length > 0 ? (father.children = branchArr) : ""; + //返回第一层 + return father[parentId] === rootId; + }); + return treeData != "" ? treeData : data; +} From c924b208b61cc0ae91c573dc693bf4feb238846a Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Wed, 8 Sep 2021 14:41:14 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AE=A1=E5=88=92=E6=89=93=E5=8D=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/benyi/themetermplan/table.vue | 48 +++++++++++++++++-- .../benyi/themetermplanapproval/approval.vue | 48 +++++++++++++++++-- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/themetermplan/table.vue b/ruoyi-ui/src/views/benyi/themetermplan/table.vue index a67345959..85ab0abd8 100644 --- a/ruoyi-ui/src/views/benyi/themetermplan/table.vue +++ b/ruoyi-ui/src/views/benyi/themetermplan/table.vue @@ -213,15 +213,53 @@ export default { background: #f8f8f8; } } - .warning { - padding-top: 20px; - font-size: 12px; - color: #666; - } + // .warning { + // padding-top: 20px; + // font-size: 12px; + // color: #666; + // } } @media print { .table-container { padding: 30px 0; + .title { + margin: 0; + font-size: 18px; + text-align: center; + padding: 15px 0; + } + .title2 { + padding: 0; + } + .align-center { + text-align: center; + } + .table { + font-size: 14px; + .print { + display: flex; + justify-content: flex-end; + padding-bottom: 10px; + } + p { + margin: 0; + } + table { + width: 100%; + border-collapse: collapse; + } + table td { + border: #ccc solid 1px; + line-height: 24px; + padding: 8px 5px; + } + .table-title { + font-size: 16px; + } + .table-bg { + background: #f8f8f8; + } + } } .print { opacity: 0; diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue index 6eed6510a..d3cbf586a 100644 --- a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue +++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue @@ -264,15 +264,53 @@ export default { background: #f8f8f8; } } - .warning { - padding-top: 20px; - font-size: 12px; - color: #666; - } + // .warning { + // padding-top: 20px; + // font-size: 12px; + // color: #666; + // } } @media print { .table-container { padding: 30px 0; + .title { + margin: 0; + font-size: 18px; + text-align: center; + padding: 15px 0; + } + .title2 { + padding: 0; + } + .align-center { + text-align: center; + } + .table { + font-size: 14px; + .print { + display: flex; + justify-content: flex-end; + padding-bottom: 10px; + } + p { + margin: 0; + } + table { + width: 100%; + border-collapse: collapse; + } + table td { + border: #ccc solid 1px; + line-height: 24px; + padding: 8px 5px; + } + .table-title { + font-size: 16px; + } + .table-bg { + background: #f8f8f8; + } + } } .print { opacity: 0; From 98f918b8a81020c11b226e4755c51e46612a99aa Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Wed, 8 Sep 2021 16:25:05 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=95=B0=E5=AD=A6=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=87=E8=AF=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/benyi/themetermplanapproval/approval.vue | 4 +--- .../project/benyi/controller/ByMathTermplanController.java | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue index d3cbf586a..b281e65a5 100644 --- a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue +++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue @@ -270,6 +270,7 @@ export default { // color: #666; // } } + @media print { .table-container { padding: 30px 0; @@ -312,9 +313,6 @@ export default { } } } - .print { - opacity: 0; - } } /*去除页眉页脚*/ @page { diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java index e33f9a148..bb0d19826 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java @@ -119,7 +119,7 @@ public class ByMathTermplanController extends BaseController { String bjtypeNew = byClassService.selectByClassById(classId).getBjtype(); if (bjtypeNew.equals("1")) { return AjaxResult.error("当前班级为托班，无法创建计划"); - }else { + } else { int iCount = schoolCommon.getDifMonth(byMathTermplan.getStartmonth(), byMathTermplan.getEndmonth()); System.out.println("月份差=" + iCount); String uuid = schoolCommon.getUuid(); @@ -171,7 +171,10 @@ public class ByMathTermplanController extends BaseController { byMathTermplanitem.setTpid(ids[i]); List list = byMathTermplanitemService.selectByMathTermplanitemList(byMathTermplanitem); if (list != null && list.size() > 0) { - return AjaxResult.error("选中的计划下存在计划明细，无法删除"); + //return AjaxResult.error("选中的计划下存在计划明细，无法删除"); + for (int j = 0; j < list.size(); j++) { + byMathTermplanitemService.deleteByMathTermplanitemById(list.get(j).getId()); + } } } return toAjax(byMathTermplanService.deleteByMathTermplanByIds(ids)); From 042918a532dc01e72690759cc8b1ff8d0c7c4d1b Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Wed, 15 Sep 2021 11:42:50 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E5=92=8C=E6=8B=9B=E7=94=9F=E9=A1=B5=E9=9D=A2=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/benyi/experience/index.vue | 2 +- .../src/views/benyi/filelibrary/index.vue | 28 +++++++++++++------ .../mybatis/benyi/ByHalfdayplanMapper.xml | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/experience/index.vue b/ruoyi-ui/src/views/benyi/experience/index.vue index 1e60957d0..195ce4697 100644 --- a/ruoyi-ui/src/views/benyi/experience/index.vue +++ b/ruoyi-ui/src/views/benyi/experience/index.vue @@ -359,7 +359,7 @@ import { getUserProfile } from "@/api/system/user"; import Clipboard from "clipboard"; export default { - name: "Experience", + name: "Experience1", data() { return { inviteCode: "", diff --git a/ruoyi-ui/src/views/benyi/filelibrary/index.vue b/ruoyi-ui/src/views/benyi/filelibrary/index.vue index 65812604a..4413a7f9a 100644 --- a/ruoyi-ui/src/views/benyi/filelibrary/index.vue +++ b/ruoyi-ui/src/views/benyi/filelibrary/index.vue @@ -59,13 +59,20 @@ label="操作" align="center" fixed="right" - class-name="small-padding fixed-width edit-btns" + class-name="small-padding fixed-width" >