瀏覽代碼

班级巡查

fanxp 2 年之前
父節點
當前提交
b80529e1d6

+ 22 - 17
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.java

@@ -32,14 +32,14 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
+ * @title: 学生考核类别
+ * @Author fanxp
+ * @Date: 2023-11-14
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/student" + "/basestudentassessmentcategory")
-@Api(value = "/student"  + "/basestudentassessmentcategory",tags = "学生考核类别代码")
+@Api(value = "/student" + "/basestudentassessmentcategory", tags = "学生考核类别代码")
 @AllArgsConstructor
 public class BaseStudentAssessmentCategoryController {
 
@@ -47,27 +47,32 @@ public class BaseStudentAssessmentCategoryController {
     private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
 
     @GetMapping(value = "/list")
-    @ApiOperation(value="学生考核类别列表(不分页)")
+    @ApiOperation(value = "学生考核类别列表(不分页)")
     @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto){
+    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto) {
 
         LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    .orderByDesc(BaseStudentAssessmentCategory::getId)
-                    .select(BaseStudentAssessmentCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
+                .orderByDesc(BaseStudentAssessmentCategory::getId)
+                .select(BaseStudentAssessmentCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
 
         List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
+        list.forEach((node) -> {
+            if (node.getTotalScore() > 0) {
+                node.setName(String.format("%s(总分:%s)", node.getName(), node.getTotalScore().toString()));
+            }
+        });
         List<BaseStudentAssessmentCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentCategoryListVo.class);
         return RT.ok(listVos);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生考核类别信息")
+    @ApiOperation(value = "根据id查询学生考核类别信息")
     @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id){
+    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);
         if (baseStudentAssessmentCategory == null) {
-           return RT.error("找不到此数据!");
+            return RT.error("找不到此数据!");
         }
         return RT.ok(BeanUtil.toBean(baseStudentAssessmentCategory, BaseStudentAssessmentCategoryVo.class));
     }
@@ -76,16 +81,16 @@ public class BaseStudentAssessmentCategoryController {
     @PostMapping
     @ApiOperation(value = "新增学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto){
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
         boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto) {
 
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
         return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
@@ -95,7 +100,7 @@ public class BaseStudentAssessmentCategoryController {
     @DeleteMapping
     @ApiOperation(value = "删除学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(baseStudentAssessmentCategoryService.removeBatchByIds(ids));
 
     }