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

# Conflicts:
#	src/main/resources/sqlScript/20231113_sql.sql

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

@@ -0,0 +1,119 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+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.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorCategoryDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryListDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorCategoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryListVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentbehaviorcategory")
+@Api(value = "/student"  + "/basestudentbehaviorcategory",tags = "学生考核类别代码")
+@AllArgsConstructor
+public class BaseStudentBehaviorCategoryController {
+
+
+    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学生考核类别列表(不分页)")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<List<BaseStudentBehaviorCategoryListVo>> list(@Valid BaseStudentBehaviorCategoryListDto dto){
+
+        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentBehaviorCategory::getId)
+                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentBehaviorCategory> list = baseStudentBehaviorCategoryService.list(queryWrapper);
+        List<BaseStudentBehaviorCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentBehaviorCategoryListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生考核类别列表(分页)")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<PageOutput<BaseStudentBehaviorCategoryPageVo>> page(@Valid BaseStudentBehaviorCategoryPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentBehaviorCategory::getId)
+                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentBehaviorCategory> page = baseStudentBehaviorCategoryService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentBehaviorCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorCategoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生考核类别信息")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<BaseStudentBehaviorCategoryVo> info(@RequestParam Long id){
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = baseStudentBehaviorCategoryService.getById(id);
+        if (baseStudentBehaviorCategory == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBehaviorCategory, BaseStudentBehaviorCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorCategoryDto dto){
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
+        boolean isSuccess = baseStudentBehaviorCategoryService.save(baseStudentBehaviorCategory);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorCategoryDto dto){
+
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
+        return RT.ok(baseStudentBehaviorCategoryService.updateById(baseStudentBehaviorCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBehaviorCategoryService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+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.VoToColumnUtil;
+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.IBaseStudentBehaviorProjectService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentbehaviorproject")
+@Api(value = "/student"  + "/basestudentbehaviorproject",tags = "学生操行分考核项目代码")
+@AllArgsConstructor
+public class BaseStudentBehaviorProjectController {
+
+
+    private final IBaseStudentBehaviorProjectService baseStudentBehaviorProjectService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生操行分考核项目列表(分页)")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    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()));
+        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查询学生操行分考核项目信息")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id){
+        BaseStudentBehaviorProject baseStudentBehaviorProject = baseStudentBehaviorProjectService.getById(id);
+        if (baseStudentBehaviorProject == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBehaviorProject, BaseStudentBehaviorProjectVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorProjectDto dto){
+        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
+        boolean isSuccess = baseStudentBehaviorProjectService.save(baseStudentBehaviorProject);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorProjectDto dto){
+
+        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
+        return RT.ok(baseStudentBehaviorProjectService.updateById(baseStudentBehaviorProject));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBehaviorProjectService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorProjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @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])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,26 @@
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorCategoryListDto extends ListInput {
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorCategoryPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorProjectPageDto extends PageInput {
+
+    /**
+     * 学生考核类别编号(base_student_behavior_category)
+     */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private String baseStudentBehaviorCategoryId;
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentBehaviorCategoryDto extends AddBaseStudentBehaviorCategoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentBehaviorProjectDto extends AddBaseStudentBehaviorProjectDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_category")
+@ApiModel(value = "学生考核类别对象", description = "学生考核类别")
+public class BaseStudentBehaviorCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,158 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_project")
+@ApiModel(value = "学生操行分考核项目对象", description = "学生操行分考核项目")
+public class BaseStudentBehaviorProject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @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])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorCategoryMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorCategoryMapper extends BaseMapper<BaseStudentBehaviorCategory> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorProjectMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorProjectMapper extends BaseMapper<BaseStudentBehaviorProject> {
+
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBehaviorCategoryService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorCategoryService extends IService<BaseStudentBehaviorCategory> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBehaviorProjectService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorProjectService extends IService<BaseStudentBehaviorProject> {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBehaviorCategoryServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorCategoryMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorCategoryServiceImpl extends ServiceImpl<BaseStudentBehaviorCategoryMapper, BaseStudentBehaviorCategory> implements IBaseStudentBehaviorCategoryService {
+}

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBehaviorProjectServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorProjectMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorProjectServiceImpl extends ServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
+}

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

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.student.vo;
+
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryListVo {
+
+    /**
+    * 主键编号
+    */
+    @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("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.student.vo;
+
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别表单出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

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

@@ -0,0 +1,139 @@
+package com.xjrsoft.module.student.vo;
+
+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 fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorProjectPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @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])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,109 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生操行分考核项目表单出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorProjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @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])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -116,7 +116,8 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                             .innerJoin(XjrMenuQuick.class, XjrMenuQuick::getMenuId, Menu::getId)
                             .in(XjrMenuQuick::getRoleId,roleIds)
                             .selectAs(XjrMenuQuick::getSystemId, Menu::getSystemId)
-                            .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty())));
+                            .select(Menu::getId)
+                            .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(Menu.class).contains(x.getProperty())));
             // 去重
             menus = menus.stream().distinct().collect(Collectors.toList());
         }

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

@@ -51,6 +51,11 @@ public class MenuListVo implements Serializable, ITreeNode<MenuListVo,Long> {
      */
     private String icon;
 
+    /**
+     * 图标地址
+     */
+    private String iconUrl;
+
     /**
      * 地址
      */

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

@@ -117,13 +117,346 @@ ALTER TABLE `tl`.`base_punishment_student_relation`
   ADD COLUMN `adjust_type` INT NULL   COMMENT '调整类型 1:升级 2:降级 3:撤销' AFTER `major`,
   ADD COLUMN `adjust_date` DATE NULL   COMMENT '调整日期' AFTER `adjust_type`,
   ADD COLUMN `adjust_reason` VARCHAR(500) NULL   COMMENT '调整原因' AFTER `adjust_date`;
-  
-ALTER TABLE `tl`.`base_punishment_student_relation`   
+
+ALTER TABLE `tl`.`base_punishment_student_relation`
   CHANGE `class` `className` VARCHAR(50) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL   COMMENT '所在班级';
-  
-ALTER TABLE `tl`.`base_punishment_student_relation`   
+
+ALTER TABLE `tl`.`base_punishment_student_relation`
   ADD COLUMN `modify_user_id` INT NULL   COMMENT '修改人' AFTER `adjust_date`,
   ADD COLUMN `modify_date` DATE NULL   COMMENT '修改时间' AFTER `modify_user_id`;
-ALTER TABLE `tl`.`base_student_punishment_info`   
+ALTER TABLE `tl`.`base_student_punishment_info`
   CHANGE `class_id` `class_id` BIGINT NULL   COMMENT '班级id';
 
+-- ----------------------------
+-- 学生考核基础分设置
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_base_score;
+CREATE TABLE base_student_assessment_base_score
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
+    `assessment_cycle` varchar(20) NULL DEFAULT NULL COMMENT '考核周期方式(xjr_dictionary_item[assessment_cycle])',
+    `base_score` double NOT NULL DEFAULT 0 COMMENT '基础分',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核基础分设置';
+
+
+-- ----------------------------
+-- 学生考核等级设置
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_base_level;
+CREATE TABLE base_student_assessment_base_level
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `score_min` double NOT NULL DEFAULT 0 COMMENT '分数范围（最小）',
+    `score_max` double NOT NULL DEFAULT 0 COMMENT '分数范围（最大）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核等级设置';
+
+-- ----------------------------
+-- 学生考核类别
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_category;
+CREATE TABLE base_student_assessment_category
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
+    `total_score` double NOT NULL DEFAULT 0 COMMENT '总分',
+    `remark` VARCHAR(1000) COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
+
+
+-- ----------------------------
+-- 学生考核项目
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_project;
+CREATE TABLE base_student_assessment_project
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_assessment_category_id` bigint NOT NULL COMMENT '学生考核类别(base_student_assessment_category)',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
+    `basic_points` double NOT NULL DEFAULT 0 COMMENT '基础分',
+    `points_deducted_min` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最小）',
+    `points_deducted_max` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最大）',
+    `add_points_min` double NOT NULL DEFAULT 0 COMMENT '加分范围（最小）',
+    `add_points_max` double NOT NULL DEFAULT 0 COMMENT '加分范围（最大）',
+    `department_id` bigint NOT NULL COMMENT '所属机构(xjr_department)',
+    `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
+    `is_affect` INT NULL DEFAULT 0 COMMENT '是否影响(1:是 0:否)',
+    `processing_method` varchar(20) NULL DEFAULT NULL COMMENT '学生操行分处理方式(xjr_dictionary_item[ap_method])',
+    `behavior_score` double NOT NULL DEFAULT 0 COMMENT '折算操行分要求',
+    `base_student_behavior_project_id` bigint NOT NULL DEFAULT 0 COMMENT '操行项目编号',
+    `is_teacher_edit` INT NULL DEFAULT 0 COMMENT '是否允许班主任修改项目(1:是 0:否)',
+    `behavior_score_remark` VARCHAR(1000) NULL DEFAULT NULL COMMENT '手动处理学生操行分说明',
+    `remark` VARCHAR(1000) COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核项目';
+
+-- ----------------------------
+-- 学生班级巡查考核
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_inspection;
+CREATE TABLE base_student_assessment_inspection
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_assessment_category_id` BIGINT NULL DEFAULT NULL COMMENT '学生考核类别编号（base_student_assessment_category）',
+    `base_student_assessment_project_id` BIGINT NULL DEFAULT NULL COMMENT '学生考核项目编号（base_student_assessment_project）',
+    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
+    `grade_id` bigint NOT NULL COMMENT '入学年级(base_grade)',
+    `class_ids` varchar(4000) NOT NULL COMMENT '班级Ids(多选)',
+    `assessment_date` date NULL DEFAULT NULL COMMENT '考核时间',
+    `score` double NOT NULL DEFAULT 0 COMMENT '分数',
+    `score_type` varchar(20) NULL DEFAULT NULL COMMENT '分数类型(xjr_dictionary_item[score_type])',
+    `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
+    `reason` VARCHAR(1000) COMMENT '原因',
+    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
+    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核';
+
+
+-- ----------------------------
+-- 学生班级巡查考核-关联学生
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_student_relation;
+CREATE TABLE base_student_assessment_student_relation
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `user_id`  BIGINT NULL DEFAULT NULL COMMENT'学生id',
+    `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
+    `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 '所学专业',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联学生';
+
+
+-- ----------------------------
+-- 学生班级巡查考核-关联班级（流程结束写入数据）
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_assessment_class_relation;
+CREATE TABLE base_student_assessment_class_relation
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `class_id`  BIGINT NULL DEFAULT NULL COMMENT'班级编号id',
+    `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `teacher_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '班主任姓名',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
+
+--------------------------------------------------------------------学生考核--------------------------------------------------------------------
+
+--------------------------------------------------------------------学生操行--------------------------------------------------------------------
+
+-- ----------------------------
+-- 学生操行基础分设置
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_base_score;
+CREATE TABLE base_student_behavior_base_score
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
+    `assessment_cycle` varchar(20) NULL DEFAULT NULL COMMENT '考核周期方式(xjr_dictionary_item[assessment_cycle])',
+    `base_score` double NOT NULL DEFAULT 0 COMMENT '基础分',
+    `passing_score` double NOT NULL DEFAULT 0 COMMENT '及格分',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行基础分设置';
+
+-- ----------------------------
+-- 学生操行等级设置
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_base_level;
+CREATE TABLE base_student_behavior_base_level
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `score_min` double NOT NULL DEFAULT 0 COMMENT '分数范围（最小）',
+    `score_max` double NOT NULL DEFAULT 0 COMMENT '分数范围（最大）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行等级设置';
+
+-- ----------------------------
+-- 学生操行分考核类别
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_category;
+CREATE TABLE base_student_behavior_category
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
+    `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
+    `remark` VARCHAR(1000) COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
+
+-- ----------------------------
+-- 学生操行分考核项目
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_project;
+CREATE TABLE base_student_behavior_project
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_behavior_category_id` BIGINT NULL DEFAULT NULL COMMENT '学生考核类别编号(base_student_behavior_category)',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
+    `score_type` varchar(20) NULL DEFAULT NULL COMMENT '考核类型(xjr_dictionary_item[score_type])',
+    `score` double NOT NULL DEFAULT 0 COMMENT '分值',
+    `is_adjustment` INT NULL DEFAULT 0 COMMENT '是否允许调整(1:是 0:否)',
+    `points_deducted_min` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最小）',
+    `points_deducted_max` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最大）',
+    `is_impact_assessment` INT NULL DEFAULT 0 COMMENT '是否影响班级考核(1:是 0:否)',
+    `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`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行分考核项目';
+
+-- ----------------------------
+-- 学生操行分记录管理
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_manage;
+CREATE TABLE base_student_behavior_manage
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_behavior_category_id` BIGINT NULL DEFAULT NULL COMMENT '学生操行分考核类别编号（base_student_behavior_category）',
+    `base_student_behavior_project_id` BIGINT NULL DEFAULT NULL COMMENT '学生操行分考核项目编号（base_student_behavior_project）',
+    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
+    `grade_id` bigint NOT NULL COMMENT '入学年级(base_grade)',
+    `class_ids` varchar(4000) NOT NULL COMMENT '班级Ids(多选)',
+    `assessment_date` date NULL DEFAULT NULL COMMENT '考核时间',
+    `total_score` double NOT NULL DEFAULT 0 COMMENT '总分',
+    `score` double NOT NULL DEFAULT 0 COMMENT '分数',
+    `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)',
+    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行分记录管理';
+
+-- ----------------------------
+-- 学生操行分记录管理-关联学生
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_student_relation;
+CREATE TABLE base_student_behavior_student_relation
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `user_id`  BIGINT NULL DEFAULT NULL COMMENT'学生id',
+    `base_student_behavior_manage_id` BIGINT NULL DEFAULT NULL COMMENT '学生操行分记录管理id',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
+    `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 '所学专业',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联学生';
+
+-- ----------------------------
+-- 学生操行分记录管理-关联班级（流程结束写入数据）
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_behavior_class_relation;
+CREATE TABLE base_student_behavior_class_relation
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `class_id`  BIGINT NULL DEFAULT NULL COMMENT'班级编号id',
+    `base_student_behavior_manage_id` BIGINT NULL DEFAULT NULL COMMENT '学生操行分记录管理id',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `teacher_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '班主任姓名',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
+--------------------------------------------------------------------学生操行--------------------------------------------------------------------
+
+
+
+
+
+
+
+

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

@@ -554,6 +554,68 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学生操行分考核类别
+     */
+    @Test
+    public void gcBaseStudentBehaviorCategory() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_behavior_category");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(false);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(false);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学生操行分考核项目
+     */
+    @Test
+    public void gcBaseStudentBehaviorProject() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_behavior_project");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);