班级考核类别sortcode

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

@@ -4,12 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentCategoryDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryVo;
@@ -81,6 +83,10 @@ public class BaseStudentAssessmentCategoryController {
     @SaCheckPermission("basestudentassessmentcategory:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        QueryWrapper<BaseStudentAssessmentCategory> queryWrapperSortcode = new QueryWrapper<>();
+        queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+        BaseStudentAssessmentCategory b = baseStudentAssessmentCategoryService.getOne(queryWrapperSortcode);
+        baseStudentAssessmentCategory.setSortCode(b.getSortCode() + 1);
         baseStudentAssessmentCategory.setCreateUserId(StpUtil.getLoginIdAsLong());
         baseStudentAssessmentCategory.setCreateDate(new Date());
         boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);

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

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -145,6 +147,8 @@ public class BaseStudentAssessmentProjectController {
         queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
         BaseStudentAssessmentProject b = baseStudentAssessmentProjectService.getOne(queryWrapperSortcode);
         baseStudentAssessmentProject.setSortCode(b.getSortCode() + 1);
+        baseStudentAssessmentProject.setCreateUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentProject.setCreateDate(new Date());
         boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
         return RT.ok(isSuccess);
     }
@@ -154,6 +158,8 @@ public class BaseStudentAssessmentProjectController {
     @SaCheckPermission("basestudentassessmentproject:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentProjectDto dto) {
         BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
+        baseStudentAssessmentProject.setModifyUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentProject.setModifyDate(new Date());
         return RT.ok(baseStudentAssessmentProjectService.updateById(baseStudentAssessmentProject));
 
     }