模块列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseMenuController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
@@ -84,7 +85,7 @@ public class CourseMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "课程目录结构", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseMenuAddBo bo) {
+    public AjaxResult<Void> add(@RequestBody CourseMenuListAddBo bo) {
         return toAjax(iCourseMenuService.insertByAddBo(bo) ? 1 : 0);
     }
 
@@ -95,7 +96,7 @@ public class CourseMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "课程目录结构", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseMenuEditBo bo) {
+    public AjaxResult<Void> edit(@RequestBody CourseMenuListAddBo bo) {
         return toAjax(iCourseMenuService.updateByEditBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuListAddBo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 课程目录结构添加对象 course_menu
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("课程目录结构添加对象")
+public class CourseMenuListAddBo {
+
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+
+    /** 菜单列表 */
+    @ApiModelProperty("菜单列表")
+    private List<CourseMenuAddBo> menuList;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseMenuService.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenu;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
@@ -33,14 +34,14 @@ public interface ICourseMenuService extends IService<CourseMenu> {
 	 * @param bo 课程目录结构新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(CourseMenuAddBo bo);
+	Boolean insertByAddBo(CourseMenuListAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改课程目录结构
 	 * @param bo 课程目录结构编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(CourseMenuEditBo bo);
+	Boolean updateByEditBo(CourseMenuListAddBo bo);
 
 	/**
 	 * 校验并删除数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -6,8 +6,10 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenu;
+import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
 import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
 import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
@@ -16,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -69,20 +72,38 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
     }
 
     @Override
-    public Boolean insertByAddBo(CourseMenuAddBo bo) {
-        CourseMenu add = BeanUtil.toBean(bo, CourseMenu.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByAddBo(CourseMenuListAddBo bo) {
+        boolean result = false;
+        for(int i=0;i<bo.getMenuList().size();i++){
+            CourseMenu add = BeanUtil.toBean(bo.getMenuList().get(i), CourseMenu.class);
+            validEntityBeforeSave(add);
+            add.setCourseId(bo.getCourseId());
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            result = this.save(add);
+        }
+        return result;
     }
 
     @Override
-    public Boolean updateByEditBo(CourseMenuEditBo bo) {
-        CourseMenu update = BeanUtil.toBean(bo, CourseMenu.class);
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByEditBo(CourseMenuListAddBo bo) {
+        boolean result = false;
+        remove(new LambdaQueryWrapper<CourseMenu>().eq(CourseMenu::getCourseId, bo.getCourseId()));
+        for(int i=0;i<bo.getMenuList().size();i++){
+            CourseMenu add = BeanUtil.toBean(bo.getMenuList().get(i), CourseMenu.class);
+            validEntityBeforeSave(add);
+            add.setCourseId(bo.getCourseId());
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            result = this.save(add);
+        }
+        return result;
+       /* CourseMenu update = BeanUtil.toBean(bo, CourseMenu.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        return this.updateById(update);*/
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -133,4 +133,6 @@ public class GoodsVo {
 	private Long createTime;
 	@ApiModelProperty("更新试卷")
 	private Long updateTime;
+	@ApiModelProperty("供应方名称")
+	private String supplyName;
 }