班级考核重构

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -49,7 +51,7 @@ public class BaseStudentAssessmentCategoryController {
 
         LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                .orderByDesc(BaseStudentAssessmentCategory::getId)
+                .orderByDesc(BaseStudentAssessmentCategory::getSortCode)
                 .select(BaseStudentAssessmentCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
 
         List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
@@ -79,6 +81,8 @@ public class BaseStudentAssessmentCategoryController {
     @SaCheckPermission("basestudentassessmentcategory:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        baseStudentAssessmentCategory.setCreateUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentCategory.setCreateDate(new Date());
         boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
         return RT.ok(isSuccess);
     }
@@ -87,10 +91,10 @@ public class BaseStudentAssessmentCategoryController {
     @ApiOperation(value = "修改学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto) {
-
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        baseStudentAssessmentCategory.setModifyUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentCategory.setModifyDate(new Date());
         return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
-
     }
 
     @DeleteMapping

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

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -29,6 +30,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,7 +57,8 @@ public class BaseStudentAssessmentItemController {
         LambdaQueryWrapper<BaseStudentAssessmentItem> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                     .orderByDesc(BaseStudentAssessmentItem::getId)
-                .select(BaseStudentAssessmentItem.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentItemPageVo.class).contains(x.getProperty()));
+                .select(BaseStudentAssessmentItem.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentItemPageVo.class).contains(x.getProperty()))
+                .eq(dto.getBaseStudentAssessmentCategoryId() != null, BaseStudentAssessmentItem::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId());
         IPage<BaseStudentAssessmentItem> page = baseStudentAssessmentItemService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentAssessmentItemPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentItemPageVo.class);
         return RT.ok(pageOutput);
@@ -77,6 +81,8 @@ public class BaseStudentAssessmentItemController {
     @SaCheckPermission("basestudentassessmentitem:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentItemDto dto){
         BaseStudentAssessmentItem baseStudentAssessmentItem = BeanUtil.toBean(dto, BaseStudentAssessmentItem.class);
+        baseStudentAssessmentItem.setCreateUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentItem.setCreateDate(new Date());
         boolean isSuccess = baseStudentAssessmentItemService.save(baseStudentAssessmentItem);
     return RT.ok(isSuccess);
     }
@@ -85,8 +91,9 @@ public class BaseStudentAssessmentItemController {
     @ApiOperation(value = "修改考核项目表")
     @SaCheckPermission("basestudentassessmentitem:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentItemDto dto){
-
         BaseStudentAssessmentItem baseStudentAssessmentItem = BeanUtil.toBean(dto, BaseStudentAssessmentItem.class);
+        baseStudentAssessmentItem.setModifyUserId(StpUtil.getLoginIdAsLong());
+        baseStudentAssessmentItem.setModifyDate(new Date());
         return RT.ok(baseStudentAssessmentItemService.updateById(baseStudentAssessmentItem));
 
     }

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.toolkit.MPJWrappers;
@@ -17,13 +18,16 @@ import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentItem;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentItemService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectVo;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -52,9 +56,10 @@ import java.util.List;
 @AllArgsConstructor
 public class BaseStudentAssessmentProjectController {
 
-
     private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
 
+    private final IBaseStudentAssessmentItemService baseStudentAssessmentItemService;
+
     private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
 
 
@@ -71,7 +76,7 @@ public class BaseStudentAssessmentProjectController {
             }});
         });
 
-        baseStudentAssessmentProjectService.list().forEach((node)->{
+        baseStudentAssessmentItemService.list().forEach((node)->{
             voList.add(new BaseStudentAssessmentProjectTreeVo(){{
                 setId(node.getId());
                 setName(node.getName());
@@ -90,12 +95,12 @@ public class BaseStudentAssessmentProjectController {
 
         MPJBaseJoin<BaseStudentAssessmentProject> queryWrapper = MPJWrappers.<BaseStudentAssessmentProject>lambdaJoin()
                 .disableSubLogicDel()
-                .orderByDesc(BaseStudentAssessmentProject::getId)
+                .orderByDesc(BaseStudentAssessmentProject::getSortCode)
                 .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
                 .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()))
-                .leftJoin(BaseStudentAssessmentCategory.class, BaseStudentAssessmentCategory::getId, BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId)
+                .leftJoin(BaseStudentAssessmentItem.class, BaseStudentAssessmentItem::getId, BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId)
                 .select(BaseStudentAssessmentProject::getId)
-                .selectAs(BaseStudentAssessmentCategory::getName,BaseStudentAssessmentProjectPageVo::getBaseStudentAssessmentCategoryName);
+                .selectAs(BaseStudentAssessmentItem::getName,BaseStudentAssessmentProjectPageVo::getBaseStudentAssessmentCategoryName);
 
         IPage<BaseStudentAssessmentProjectPageVo> page = baseStudentAssessmentProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentAssessmentProjectPageVo.class,queryWrapper);
         PageOutput<BaseStudentAssessmentProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentProjectPageVo.class);
@@ -136,6 +141,10 @@ public class BaseStudentAssessmentProjectController {
     @SaCheckPermission("basestudentassessmentproject:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentProjectDto dto) {
         BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
+        QueryWrapper<BaseStudentAssessmentProject> queryWrapperSortcode = new QueryWrapper<>();
+        queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+        BaseStudentAssessmentProject b = baseStudentAssessmentProjectService.getOne(queryWrapperSortcode);
+        baseStudentAssessmentProject.setSortCode(b.getSortCode() + 1);
         boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
         return RT.ok(isSuccess);
     }
@@ -144,7 +153,6 @@ public class BaseStudentAssessmentProjectController {
     @ApiOperation(value = "修改学生考核项目")
     @SaCheckPermission("basestudentassessmentproject:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentProjectDto dto) {
-
         BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
         return RT.ok(baseStudentAssessmentProjectService.updateById(baseStudentAssessmentProject));
 

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentItemPageDto.java

@@ -22,5 +22,9 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class BaseStudentAssessmentItemPageDto extends PageInput {
 
-
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别")
+    private Long baseStudentAssessmentCategoryId;
 }

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentProjectPageDto.java

@@ -16,9 +16,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class BaseStudentAssessmentProjectPageDto extends PageInput {
     /**
-     * 学生考核类别(base_student_assessment_category)
+     * 学生考核类别(base_student_assessment_item)
      */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    @ApiModelProperty("学生考核项目id")
     private String baseStudentAssessmentCategoryId;
 
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentItemPageVo.java

@@ -26,36 +26,6 @@ public class BaseStudentAssessmentItemPageVo {
     @ApiModelProperty("")
     private String id;
     /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Long createUserId;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Date createDate;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Long modifyUserId;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Date modifyDate;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer deleteMark;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer enabledMark;
-    /**
     * 项目名称
     */
     @ApiModelProperty("项目名称")

src/test/java/com/xjrsoft/xjrsoftboot/DateTime.java

@@ -6,13 +6,16 @@ import org.junit.jupiter.api.Test;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class DateTime {
     @Test
     public void DateTimeTest(){
-        cn.hutool.core.date.DateTime now = DateUtil.date();
-        System.out.println(now.dayOfWeek());
+//        cn.hutool.core.date.DateTime now = DateUtil.date();
+//        System.out.println(now.dayOfWeek());
+
+        System.out.println(new Date());
     }
 
     @Test