Merge remote-tracking branch 'origin/dev' into dev

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

@@ -14,7 +14,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.vo.PostTreeVo;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentProjectDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
@@ -25,11 +27,10 @@ import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.entity.BaseStudentCadre;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
+import com.xjrsoft.module.student.vo.*;
 
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectPageVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -37,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,8 +54,36 @@ import java.util.List;
 public class BaseStudentAssessmentProjectController {
 
 
+    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
+
     private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
 
+
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "学生考核项目列表(树)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<List<BaseStudentAssessmentProjectTreeVo>> tree() {
+
+        List<BaseStudentAssessmentProjectTreeVo> voList = new ArrayList<>();
+        baseStudentAssessmentCategoryService.list().forEach((node) -> {
+            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+            }});
+        });
+
+        baseStudentAssessmentProjectService.list().forEach((node)->{
+            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+                setParentId(node.getBaseStudentAssessmentCategoryId());
+            }});
+        });
+        List<BaseStudentAssessmentProjectTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生考核项目列表(分页)")
     @SaCheckPermission("basestudentassessmentproject:detail")

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

@@ -11,16 +11,20 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.vo.PostTreeVo;
 import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorProjectDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorProjectDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.student.dto.BaseStudentBehaviorProjectPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
 import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
 
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,45 +33,72 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
+ * @title: 学生操行分考核项目
+ * @Author fanxp
+ * @Date: 2023-11-15
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/student" + "/basestudentbehaviorproject")
-@Api(value = "/student"  + "/basestudentbehaviorproject",tags = "学生操行分考核项目代码")
+@Api(value = "/student" + "/basestudentbehaviorproject", tags = "学生操行分考核项目代码")
 @AllArgsConstructor
 public class BaseStudentBehaviorProjectController {
 
+    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
 
     private final IBaseStudentBehaviorProjectService baseStudentBehaviorProjectService;
 
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "学生操行分考核项目列表(树)")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    public RT<List<BaseStudentBehaviorProjectTreeVo>> tree() {
+
+        List<BaseStudentBehaviorProjectTreeVo> voList = new ArrayList<>();
+        baseStudentBehaviorCategoryService.list().forEach((node) -> {
+            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+            }});
+        });
+
+        baseStudentBehaviorProjectService.list().forEach((node)->{
+            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+                setParentId(node.getBaseStudentBehaviorCategoryId());
+            }});
+        });
+        List<BaseStudentBehaviorProjectTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
     @GetMapping(value = "/page")
-    @ApiOperation(value="学生操行分考核项目列表(分页)")
+    @ApiOperation(value = "学生操行分考核项目列表(分页)")
     @SaCheckPermission("basestudentbehaviorproject:detail")
-    public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto){
+    public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
 
         LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    .orderByDesc(BaseStudentBehaviorProject::getId)
-                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()),BaseStudentBehaviorProject::getBaseStudentAssessmentProjectId,dto.getBaseStudentBehaviorCategoryId())
-                .select(BaseStudentBehaviorProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
+                .orderByDesc(BaseStudentBehaviorProject::getId)
+                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentAssessmentProjectId, dto.getBaseStudentBehaviorCategoryId())
+                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
         IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生操行分考核项目信息")
+    @ApiOperation(value = "根据id查询学生操行分考核项目信息")
     @SaCheckPermission("basestudentbehaviorproject:detail")
-    public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id){
+    public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id) {
         BaseStudentBehaviorProject baseStudentBehaviorProject = baseStudentBehaviorProjectService.getById(id);
         if (baseStudentBehaviorProject == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(BeanUtil.toBean(baseStudentBehaviorProject, BaseStudentBehaviorProjectVo.class));
     }
@@ -76,16 +107,16 @@ public class BaseStudentBehaviorProjectController {
     @PostMapping
     @ApiOperation(value = "新增学生操行分考核项目")
     @SaCheckPermission("basestudentbehaviorproject:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorProjectDto dto){
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorProjectDto dto) {
         BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
         boolean isSuccess = baseStudentBehaviorProjectService.save(baseStudentBehaviorProject);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改学生操行分考核项目")
     @SaCheckPermission("basestudentbehaviorproject:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorProjectDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorProjectDto dto) {
 
         BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
         return RT.ok(baseStudentBehaviorProjectService.updateById(baseStudentBehaviorProject));
@@ -95,7 +126,7 @@ public class BaseStudentBehaviorProjectController {
     @DeleteMapping
     @ApiOperation(value = "删除学生操行分考核项目")
     @SaCheckPermission("basestudentbehaviorproject:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(baseStudentBehaviorProjectService.removeBatchByIds(ids));
 
     }

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

@@ -18,10 +18,13 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.erpModel.caseErpBom.entity.CaseErpBom;
 import com.xjrsoft.module.erpModel.caseErpBom.vo.CaseErpBomTreeVo;
 import com.xjrsoft.module.student.dto.AddBaseStudentPostDto;
+import com.xjrsoft.module.student.dto.BaseStudentPostListDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentPostDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.vo.BaseStudentPostListVo;
 import com.xjrsoft.module.student.vo.BaseStudentPostTreeVo;
 import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
@@ -57,6 +60,22 @@ public class BaseStudentPostController {
 
     private final IBaseStudentPostService baseStudentPostService;
 
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学生职务设置列表(不分页)")
+    @SaCheckPermission("basestudentpost:detail")
+    public RT<List<BaseStudentPostListVo>> list(@Valid BaseStudentPostListDto dto){
+
+        LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(ObjectUtil.isNotNull(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
+                .orderByDesc(BaseStudentPost::getId)
+                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentPost> list = baseStudentPostService.list(queryWrapper);
+        List<BaseStudentPostListVo> listVos = BeanUtil.copyToList(list, BaseStudentPostListVo.class);
+        return RT.ok(listVos);
+    }
+
     @GetMapping(value = "/page")
     @ApiOperation(value="学生职务设置列表(分页)")
     @SaCheckPermission("basestudentpost:detail")

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

@@ -46,48 +46,27 @@ public class StudentManagerController {
     @SaCheckPermission("studentmanager:detail")
     public R page(@Valid BaseStudentUserPageDto dto) {
 
-//        MPJLambdaWrapper<BaseStudentUser> queryWrapper = new MPJLambdaWrapper<>();
-//        queryWrapper
-//                .disableSubLogicDel()
-//                .like(StrUtil.isNotBlank(dto.getUserName()), BaseStudentUser::getUserName, dto.getUserName())
-//                .like(StrUtil.isNotBlank(dto.getMobile()), BaseStudentUser::getMobile, dto.getMobile())
-//                .like(StrUtil.isNotBlank(dto.getName()), BaseStudentUser::getName, dto.getName())
-//                .like(StrUtil.isNotBlank(dto.getEmail()), BaseStudentUser::getEmail, dto.getEmail())
-//                .orderByDesc(BaseStudentUser::getId)
-//                .select(BaseStudentUser::getId)
-//                .select(BaseStudentUser.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentUserPageVo.class).contains(x.getProperty()))
-//                .select(BaseStudentSchoolRoll::getStudyYear)
-//                .select("a.`name` as grade_id")
-//                .select("b.`name` as major_set_id")
-//                .select("c.`name` as class_id")
-//                .innerJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentUser::getId)
-//                .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentUser::getId)
-//                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentSchoolRoll::getArchivesStatus, ext -> ext.selectAs(DictionaryDetail::getName, BaseStudentUserPageVo::getArchivesStatus))
-//                .leftJoin("base_grade a on a.id = t2.grade_id")
-//                .leftJoin("base_major_set b on b.id = t2.major_set_id")
-//                .leftJoin("base_class c on c.id = t2.class_id")
-//
-//                .selectAsClass(BaseStudent.class, BaseStudentUserPageVo.class);
-
-        IPage<BaseStudentUserPageVo> page =  studentManagerService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentUserPageVo.class,
+        IPage<BaseStudentUserPageVo> page = studentManagerService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentUserPageVo.class,
                 MPJWrappers.<BaseStudentUser>lambdaJoin()
-                .like(StrUtil.isNotBlank(dto.getUserName()), BaseStudentUser::getUserName, dto.getUserName())
-                .like(StrUtil.isNotBlank(dto.getMobile()), BaseStudentUser::getMobile, dto.getMobile())
-                .like(StrUtil.isNotBlank(dto.getName()), BaseStudentUser::getName, dto.getName())
-                .like(StrUtil.isNotBlank(dto.getEmail()), BaseStudentUser::getEmail, dto.getEmail())
-                .in((ObjectUtil.isNotNull(dto.getTokenType()) && dto.getTokenType() == 1), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
-                .orderByDesc(BaseStudentUser::getId)
-                .select(BaseStudentUser::getId)
-                .select(BaseStudentUser.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentUserPageVo.class).contains(x.getProperty()))
-                .select(BaseStudentSchoolRoll::getStudyYear)
-                .select("a.`name` as grade_id")
-                .select("b.`name` as major_set_id")
-                .selectAs(BaseClass::getName, BaseStudentUserPageVo::getClassId)
-                .innerJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentUser::getId)
-                .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentUser::getId)
-                .leftJoin("base_grade a on a.id = t2.grade_id")
-                .leftJoin("base_major_set b on b.id = t2.major_set_id")
-                .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId));
+                        .like(StrUtil.isNotBlank(dto.getUserName()), BaseStudentUser::getUserName, dto.getUserName())
+                        .like(StrUtil.isNotBlank(dto.getMobile()), BaseStudentUser::getMobile, dto.getMobile())
+                        .like(StrUtil.isNotBlank(dto.getName()), BaseStudentUser::getName, dto.getName())
+                        .like(StrUtil.isNotBlank(dto.getEmail()), BaseStudentUser::getEmail, dto.getEmail())
+                        .in((ObjectUtil.isNotNull(dto.getTokenType()) && dto.getTokenType() == 1), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
+                        .orderByDesc(BaseStudentUser::getId)
+                        .select(BaseStudentUser::getId)
+                        .select(BaseStudent::getStudentId)
+                        .select(BaseStudentSchoolRoll.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentUserPageVo.class).contains(x.getProperty()))
+                        .select(BaseStudentUser.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentUserPageVo.class).contains(x.getProperty()))
+                        .select(BaseStudentSchoolRoll::getStudyYear)
+                        .select("a.`name` as grade_name")
+                        .select("b.`name` as major_set_name")
+                        .selectAs(BaseClass::getName, BaseStudentUserPageVo::getClassName)
+                        .innerJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentUser::getId)
+                        .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentUser::getId)
+                        .leftJoin("base_grade a on a.id = t2.grade_id")
+                        .leftJoin("base_major_set b on b.id = t2.major_set_id")
+                        .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId));
 
         PageOutput<BaseStudentUserPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentUserPageVo.class);
         return R.ok(pageOutput);

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

@@ -90,11 +90,6 @@ public class AddBaseStudentBehaviorProjectDto implements Serializable {
     @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
     private Long baseStudentAssessmentProjectId;
     /**
-    * 是否允许修改(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许修改(1:是 0:否)")
-    private Integer isEdit;
-    /**
     * 自动换算考核类型(xjr_dictionary_item[score_type])
     */
     @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")

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

@@ -0,0 +1,29 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生职务设置列表查询入参
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentPostListDto extends ListInput {
+    /**
+     * 职务级别
+     */
+    @ApiModelProperty("职务级别")
+    private String level;
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentBehaviorProject.java

@@ -139,11 +139,6 @@ public class BaseStudentBehaviorProject implements Serializable {
     @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
     private Long baseStudentAssessmentProjectId;
     /**
-    * 是否允许修改(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许修改(1:是 0:否)")
-    private Integer isEdit;
-    /**
     * 自动换算考核类型(xjr_dictionary_item[score_type])
     */
     @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")

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

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class BaseStudentAssessmentProjectTreeVo implements ITreeNode<BaseStudentAssessmentProjectTreeVo,Long>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty("名字")
+    private String name;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    private List<BaseStudentAssessmentProjectTreeVo> children;
+}

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

@@ -121,11 +121,6 @@ public class BaseStudentBehaviorProjectPageVo {
     @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
     private Long baseStudentAssessmentProjectId;
     /**
-    * 是否允许修改(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许修改(1:是 0:否)")
-    private Integer isEdit;
-    /**
     * 自动换算考核类型(xjr_dictionary_item[score_type])
     */
     @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import com.xjrsoft.module.organization.vo.PostTreeVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class BaseStudentBehaviorProjectTreeVo implements ITreeNode<BaseStudentBehaviorProjectTreeVo,Long>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty("名字")
+    private String name;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    private List<BaseStudentBehaviorProjectTreeVo> children;
+}

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

@@ -89,11 +89,6 @@ public class BaseStudentBehaviorProjectVo {
     @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
     private Long baseStudentAssessmentProjectId;
     /**
-    * 是否允许修改(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许修改(1:是 0:否)")
-    private Integer isEdit;
-    /**
     * 自动换算考核类型(xjr_dictionary_item[score_type])
     */
     @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")

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

@@ -0,0 +1,118 @@
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生职务设置列表列表入参
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPostListVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 职务
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务")
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务级别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务级别")
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否允许德育检查(1:是 0:否)")
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职责描述")
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否启用(1:是 0:否)")
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+}

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

@@ -62,21 +62,36 @@ public class BaseStudentUserPageVo {
      */
     @ApiModelProperty("班级年级")
     private String gradeId;
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    private String gradeName;
     /**
      * 招生类型
      */
     @ApiModelProperty("招生类型")
     private String enrollType;
+    /**
+     * 班级编号
+     */
+    @ApiModelProperty("班级编号")
+    private String classId;
     /**
      * 班级名称
      */
     @ApiModelProperty("班级名称")
-    private String classId;
+    private String className;
     /**
      * 专业方向
      */
-    @ApiModelProperty("班级名称")
+    @ApiModelProperty("专业方向编号")
     private String majorSetId;
+    /**
+     * 专业方向
+     */
+    @ApiModelProperty("专业方向名称")
+    private String majorSetName;
     /**
      * 学制
      */

src/main/resources/sqlScript/20231113_sql.sql

@@ -268,8 +268,8 @@ CREATE TABLE base_student_assessment_student_relation
     `name` VARCHAR(30) NULL DEFAULT NULL COMMENT '姓名',
     `gender` VARCHAR(30) NULL DEFAULT 1 COMMENT '性别',
     `nation` VARCHAR(30) NULL DEFAULT NULL COMMENT '民族(xjr_dictionary_item[nation])',
-    `class` VARCHAR(50) NULL DEFAULT NULL COMMENT '所在班级',
-    `major` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
+    `class_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '所在班级',
+    `major_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联学生';
 
@@ -380,7 +380,6 @@ CREATE TABLE base_student_behavior_project
     `conversion_method` INT NULL DEFAULT 1 COMMENT '换算方式(1:手动换算 2:自动换算)',
     `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
     `base_student_assessment_project_id` BIGINT NULL DEFAULT NULL COMMENT '班级考核项目编号（base_student_assessment_project）',
-    `is_edit` INT NULL DEFAULT 0 COMMENT '是否允许修改(1:是 0:否)',
     `automatic_score_type` varchar(20) NULL DEFAULT NULL COMMENT '自动换算考核类型(xjr_dictionary_item[score_type])',
     `remark` VARCHAR(1000) COMMENT '备注',
     PRIMARY KEY (`id`)
@@ -411,7 +410,6 @@ CREATE TABLE base_student_behavior_manage
     `score_number` double NOT NULL DEFAULT 0 COMMENT '分数次数',
     `is_affect` INT NULL DEFAULT 0 COMMENT '是否影响(1:是 0:否)',
     `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
-    `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
     `assessment_department_id` bigint NOT NULL COMMENT '考核机构(xjr_department)',
     `remark` VARCHAR(1000) COMMENT '备注',
     `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
@@ -453,6 +451,10 @@ CREATE TABLE base_student_behavior_class_relation
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
 --------------------------------------------------------------------学生操行--------------------------------------------------------------------
 
+--------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+
+--------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+
 
 
 

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

@@ -484,10 +484,10 @@ public class FreeMarkerGeneratorTest {
         params.setAuthor("dzx");//作者名称
         params.setPackageName("student");//包名
         params.setTableConfigs(tableConfigs);
-        params.setPage(true);//是否生成分页接口
+        params.setPage(false);//是否生成分页接口
         params.setImport(false);//是否生成导入接口
         params.setExport(true);//是否生成导出接口
-        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setOutMainDir(false);//是否生成在主目录，前期测试可设置成false
         params.setDs(ds);