班级列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -54,9 +54,9 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+/*    *//**
      * 导出班级列表
-     */
+     *//*
     @ApiOperation("导出班级列表")
     @PreAuthorize("@ss.hasPermi('modules.grade:grade:export')")
     @Log(title = "班级", businessType = BusinessType.EXPORT)
@@ -65,7 +65,7 @@ public class ClassGradeController extends BaseController {
         List<ClassGradeVo> list = iClassGradeService.queryList(bo);
         ExcelUtil<ClassGradeVo> util = new ExcelUtil<ClassGradeVo>(ClassGradeVo.class);
         return util.exportExcel(list, "班级");
-    }
+    }*/
 
     /**
      * 获取班级详细信息
@@ -94,19 +94,19 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("修改班级")
     @PreAuthorize("@ss.hasPermi('modules.grade:grade:edit')")
     @Log(title = "班级", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody ClassGradeEditBo bo) {
         return toAjax(iClassGradeService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
+/*    *//**
      * 删除班级
-     */
+     *//*
     @ApiOperation("删除班级")
     @PreAuthorize("@ss.hasPermi('modules.grade:grade:remove')")
     @Log(title = "班级" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{classIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] classIds) {
         return toAjax(iClassGradeService.deleteWithValidByIds(Arrays.asList(classIds), true) ? 1 : 0);
-    }
+    }*/
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeAddBo.java

@@ -1,11 +1,12 @@
 package com.zhongzheng.modules.grade.bo;
 
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -73,4 +74,8 @@ public class ClassGradeAddBo {
     /** 学时推送 */
     @ApiModelProperty("学时推送")
     private Long interfacePeriodId;
+
+    /** 学时推送 */
+    @ApiModelProperty("学时推送")
+    private List<ClassGradeGoodsAddBo> classGradeGoodsAddBos;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -91,4 +92,8 @@ public class ClassGradeEditBo {
     @ApiModelProperty("学时推送")
     private Long interfacePeriodId;
 
+    /** 学时推送 */
+    @ApiModelProperty("学时推送")
+    private List<ClassGradeGoodsEditBo> classGradeGoodsEditBoList;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -2,15 +2,17 @@ package com.zhongzheng.modules.grade.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.grade.bo.*;
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
+import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 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 com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.mapper.ClassGradeMapper;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
@@ -30,6 +32,10 @@ import java.util.stream.Collectors;
 @Service
 public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGrade> implements IClassGradeService {
 
+
+    @Autowired
+    private IClassGradeGoodsService classGradeGoodsService;
+
     @Override
     public ClassGradeVo queryById(Long classId){
         ClassGrade db = this.baseMapper.selectById(classId);
@@ -83,7 +89,17 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean save = this.save(add);
+        if (CollectionUtils.isNotEmpty(bo.getClassGradeGoodsAddBos())){
+            for (ClassGradeGoodsAddBo classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
+                ClassGradeGoods classGradeGoods = BeanUtil.toBean(classGradeGoodsAddBo, ClassGradeGoods.class);
+                classGradeGoods.setGradeId(add.getClassId());
+                classGradeGoods.setCreateTime(DateUtils.getNowTime());
+                classGradeGoods.setUpdateTime(DateUtils.getNowTime());
+                classGradeGoodsService.save(classGradeGoods);
+            }
+        }
+        return save;
     }
 
     @Override
@@ -91,6 +107,15 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        LambdaQueryWrapper<ClassGradeGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getClassId() != null, ClassGradeGoods::getGradeId, bo.getClassId());
+        classGradeGoodsService.remove(lqw);
+        if (CollectionUtils.isNotEmpty(bo.getClassGradeGoodsEditBoList())){
+            for (ClassGradeGoodsEditBo classGradeGoodsEditBo : bo.getClassGradeGoodsEditBoList()) {
+                ClassGradeGoods classGradeGoods = BeanUtil.toBean(classGradeGoodsEditBo, ClassGradeGoods.class);
+                classGradeGoodsService.updateById(classGradeGoods);
+            }
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -2,11 +2,15 @@ package com.zhongzheng.modules.grade.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -89,4 +93,29 @@ public class ClassGradeVo {
 	@Excel(name = "学时推送")
 	@ApiModelProperty("学时推送")
 	private Long interfacePeriodId;
+
+	/** 班级关联商品 */
+	@Excel(name = "班级关联商品")
+	@ApiModelProperty("班级关联商品")
+	private List<GoodsVo> goodsList;
+
+	/** 用户昵称 */
+	@Excel(name = "用户名称")
+	@ApiModelProperty("用户名称")
+	private String nickName;
+
+	/** 官方账号开通名字 */
+	@Excel(name = "官方账号开通名字")
+	@ApiModelProperty("官方账号开通名字")
+	private String interfaceAccountName;
+	/** 学时推送名字 */
+	@Excel(name = "学时推送名字")
+	@ApiModelProperty("学时推送名字")
+	private String interfacePeriodName;
+
+	/** 官方信息推送接口名字 */
+	@Excel(name = "官方信息推送接口名字")
+	@ApiModelProperty("官方信息推送接口名字")
+	private String interfacePushName;
+
 }