1、班级量化考核导出调整

2、菜单分类调整

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -131,7 +131,7 @@ public class BaseStudentAssessmentInspectionController {
 //    public ResponseEntity<byte[]>  exportDataQuery(@Valid @RequestBody QuantitativeAssessmentExcelDto dto) {
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]>  exportDataQuery(@Valid CalssQuantitativeAssessmentPageDto dto) throws IOException {
+    public ResponseEntity<byte[]>  exportDataQuery(@Valid  @RequestBody CalssQuantitativeAssessmentPageDto dto) throws IOException {
         byte[] bytes = inspectionService.getExcelByte(dto);
         String fileName = "recordExport" + ExcelTypeEnum.XLSX.getValue();
         return RT.fileStream(bytes, fileName);

src/main/java/com/xjrsoft/module/system/controller/XjrMenuGroupSetController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.system.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -8,19 +9,25 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.system.dto.AddXjrMenuGroupDto;
+import com.xjrsoft.module.system.dto.AddXjrMenuGroupSetDto;
+import com.xjrsoft.module.system.dto.UpdateXjrMenuGroupSetDto;
 import com.xjrsoft.module.system.dto.XjrMenuGroupMenuListDto;
 import com.xjrsoft.module.system.dto.XjrMenuGroupSetPageDto;
 import com.xjrsoft.module.system.entity.XjrMenuGroupSet;
 import com.xjrsoft.module.system.service.IXjrMenuGroupSetService;
 import com.xjrsoft.module.system.vo.XjrMenuGroupMenuListVo;
 import com.xjrsoft.module.system.vo.XjrMenuGroupSetPageVo;
+import com.xjrsoft.module.system.vo.XjrMenuGroupSetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -55,41 +62,41 @@ public class XjrMenuGroupSetController {
         return RT.ok(pageOutput);
     }
 
-//    @GetMapping(value = "/info")
-//    @ApiOperation(value="根据id查询功能分类设置信息")
-//    @SaCheckPermission("xjrmenugroupset:detail")
-//    public RT<XjrMenuGroupSetVo> info(@RequestParam Long id){
-//        XjrMenuGroupSet xjrMenuGroupSet = xjrMenuGroupSetService.getByIdDeep(id);
-//        if (xjrMenuGroupSet == null) {
-//           return RT.error("找不到此数据！");
-//        }
-//        return RT.ok(BeanUtil.toBean(xjrMenuGroupSet, XjrMenuGroupSetVo.class));
-//    }
-//
-//
-//    @PostMapping
-//    @ApiOperation(value = "新增功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:add")
-//    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuGroupSetDto dto){
-//        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
-//        boolean isSuccess = xjrMenuGroupSetService.add(xjrMenuGroupSet);
-//        return RT.ok(isSuccess);
-//    }
-//
-//    @PutMapping
-//    @ApiOperation(value = "修改功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:edit")
-//    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuGroupSetDto dto){
-//        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
-//        return RT.ok(xjrMenuGroupSetService.update(xjrMenuGroupSet));
-//    }
-//
-//    @DeleteMapping
-//    @ApiOperation(value = "删除功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:delete")
-//    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-//        return RT.ok(xjrMenuGroupSetService.delete(ids));
-//    }
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询功能分类设置信息")
+    @SaCheckPermission("xjrmenugroupset:detail")
+    public RT<XjrMenuGroupSetVo> info(@RequestParam Long id){
+        XjrMenuGroupSet xjrMenuGroupSet = xjrMenuGroupSetService.getByIdDeep(id);
+        if (xjrMenuGroupSet == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrMenuGroupSet, XjrMenuGroupSetVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuGroupSetDto dto){
+        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
+        boolean isSuccess = xjrMenuGroupSetService.add(xjrMenuGroupSet);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuGroupSetDto dto){
+        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
+        return RT.ok(xjrMenuGroupSetService.update(xjrMenuGroupSet));
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrMenuGroupSetService.delete(ids));
+    }
 
     @GetMapping(value = "/menu-list")
     @ApiOperation(value = "查询学生菜单")

src/main/java/com/xjrsoft/module/system/dto/AddXjrMenuGroupSetDto.java

@@ -40,4 +40,7 @@ public class AddXjrMenuGroupSetDto implements Serializable {
     */
     @ApiModelProperty("xjrMenuGroup子表")
     private List<AddXjrMenuGroupDto> xjrMenuGroupList;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
 }

src/main/java/com/xjrsoft/module/system/entity/XjrMenuGroupSet.java

@@ -95,4 +95,7 @@ public class XjrMenuGroupSet implements Serializable {
     @EntityMapping(thisField = "id", joinField = "xjrMenuGroupSetId")
     private List<XjrMenuGroup> xjrMenuGroupList;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }

src/main/java/com/xjrsoft/module/system/vo/XjrMenuGroupSetPageVo.java

@@ -65,4 +65,7 @@ public class XjrMenuGroupSetPageVo {
     @ApiModelProperty("使用范围(1:全部学生 2:白名单学生)")
     private Integer useRange;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }

src/main/java/com/xjrsoft/module/system/vo/XjrMenuGroupSetVo.java

@@ -42,4 +42,7 @@ public class XjrMenuGroupSetVo {
     @ApiModelProperty("xjrMenuGroup子表")
     private List<XjrMenuGroupVo> xjrMenuGroupList;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }