Browse Source

班级巡查

fanxp 1 year ago
parent
commit
d629a900fe
22 changed files with 1433 additions and 1 deletions
  1. 103 0
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.java
  2. 105 0
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentProjectController.java
  3. 53 0
      src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentCategoryDto.java
  4. 118 0
      src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentProjectDto.java
  5. 26 0
      src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentCategoryListDto.java
  6. 30 0
      src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentProjectListDto.java
  7. 32 0
      src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentCategoryDto.java
  8. 32 0
      src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentProjectDto.java
  9. 103 0
      src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentCategory.java
  10. 168 0
      src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentProject.java
  11. 17 0
      src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentCategoryMapper.java
  12. 17 0
      src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentProjectMapper.java
  13. 17 0
      src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentCategoryService.java
  14. 17 0
      src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentProjectService.java
  15. 25 0
      src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentCategoryServiceImpl.java
  16. 25 0
      src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentProjectServiceImpl.java
  17. 84 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryListVo.java
  18. 54 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryVo.java
  19. 149 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectListVo.java
  20. 119 0
      src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectVo.java
  21. 77 1
      src/main/resources/sqlScript/20231113_sql.sql
  22. 62 0
      src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

+ 103 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.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.AddBaseStudentAssessmentCategoryDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryVo;
+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-14
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentassessmentcategory")
+@Api(value = "/student"  + "/basestudentassessmentcategory",tags = "学生考核类别代码")
+@AllArgsConstructor
+public class BaseStudentAssessmentCategoryController {
+
+
+    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学生考核类别列表(不分页)")
+    @SaCheckPermission("basestudentassessmentcategory:detail")
+    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto){
+
+        LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentAssessmentCategory::getId)
+                    .select(BaseStudentAssessmentCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
+        List<BaseStudentAssessmentCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentCategoryListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生考核类别信息")
+    @SaCheckPermission("basestudentassessmentcategory:detail")
+    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id){
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);
+        if (baseStudentAssessmentCategory == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentAssessmentCategory, BaseStudentAssessmentCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto){
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto){
+
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentAssessmentCategoryService.removeBatchByIds(ids));
+
+    }
+
+}

+ 105 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentProjectController.java

@@ -0,0 +1,105 @@
+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.AddBaseStudentAssessmentProjectDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import com.xjrsoft.module.student.entity.BaseStudentCadre;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectVo;
+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-14
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/student" + "/basestudentassessmentproject")
+@Api(value = "/student" + "/basestudentassessmentproject", tags = "学生考核项目代码")
+@AllArgsConstructor
+public class BaseStudentAssessmentProjectController {
+
+
+    private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "学生考核项目列表(不分页)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<List<BaseStudentAssessmentProjectListVo>> list(@Valid BaseStudentAssessmentProjectListDto dto) {
+
+        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentAssessmentProject::getId)
+                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
+                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentAssessmentProject> list = baseStudentAssessmentProjectService.list(queryWrapper);
+        List<BaseStudentAssessmentProjectListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentProjectListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value = "根据id查询学生考核项目信息")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<BaseStudentAssessmentProjectVo> info(@RequestParam Long id) {
+        BaseStudentAssessmentProject baseStudentAssessmentProject = baseStudentAssessmentProjectService.getById(id);
+        if (baseStudentAssessmentProject == null) {
+            return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentAssessmentProject, BaseStudentAssessmentProjectVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生考核项目")
+    @SaCheckPermission("basestudentassessmentproject:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentProjectDto dto) {
+        BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
+        boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @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));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生考核项目")
+    @SaCheckPermission("basestudentassessmentproject:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
+        return RT.ok(baseStudentAssessmentProjectService.removeBatchByIds(ids));
+
+    }
+
+}

+ 53 - 0
src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentCategoryDto.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-14
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

+ 118 - 0
src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentProjectDto.java

@@ -0,0 +1,118 @@
+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-14
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentProjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围(最小)
+    */
+    @ApiModelProperty("扣分范围(最小)")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围(最大)
+    */
+    @ApiModelProperty("扣分范围(最大)")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围(最小)
+    */
+    @ApiModelProperty("加分范围(最小)")
+    private Double addPointsMin;
+    /**
+    * 加分范围(最大)
+    */
+    @ApiModelProperty("加分范围(最大)")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

+ 26 - 0
src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentCategoryListDto.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-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentCategoryListDto extends ListInput {
+
+
+}

+ 30 - 0
src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentProjectListDto.java

@@ -0,0 +1,30 @@
+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-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentProjectListDto extends ListInput {
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryId;
+
+}

+ 32 - 0
src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentCategoryDto.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-14
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentCategoryDto extends AddBaseStudentAssessmentCategoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 32 - 0
src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentProjectDto.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-14
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentProjectDto extends AddBaseStudentAssessmentProjectDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 103 - 0
src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentCategory.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-14
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_category")
+@ApiModel(value = "学生考核类别对象", description = "学生考核类别")
+public class BaseStudentAssessmentCategory 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;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

+ 168 - 0
src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentProject.java

@@ -0,0 +1,168 @@
+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-14
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_project")
+@ApiModel(value = "学生考核项目对象", description = "学生考核项目")
+public class BaseStudentAssessmentProject 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_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围(最小)
+    */
+    @ApiModelProperty("扣分范围(最小)")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围(最大)
+    */
+    @ApiModelProperty("扣分范围(最大)")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围(最小)
+    */
+    @ApiModelProperty("加分范围(最小)")
+    private Double addPointsMin;
+    /**
+    * 加分范围(最大)
+    */
+    @ApiModelProperty("加分范围(最大)")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentCategoryMapper.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.BaseStudentAssessmentCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentCategoryMapper extends BaseMapper<BaseStudentAssessmentCategory> {
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentProjectMapper.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.BaseStudentAssessmentProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentProjectMapper extends BaseMapper<BaseStudentAssessmentProject> {
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentCategoryService.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.BaseStudentAssessmentCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentCategoryService extends IService<BaseStudentAssessmentCategory> {
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentProjectService.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.BaseStudentAssessmentProject;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentProjectService extends IService<BaseStudentAssessmentProject> {
+}

+ 25 - 0
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentCategoryServiceImpl.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.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentCategoryMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+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-14
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentCategoryServiceImpl extends ServiceImpl<BaseStudentAssessmentCategoryMapper, BaseStudentAssessmentCategory> implements IBaseStudentAssessmentCategoryService {
+}

+ 25 - 0
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentProjectServiceImpl.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.BaseStudentAssessmentProject;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentProjectMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
+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-14
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentProjectServiceImpl extends ServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
+}

+ 84 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryListVo.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-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentCategoryListVo {
+
+    /**
+    * 主键编号
+    */
+    @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;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

+ 54 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryVo.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-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

+ 149 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectListVo.java

@@ -0,0 +1,149 @@
+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-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectListVo {
+
+    /**
+    * 主键编号
+    */
+    @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_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围(最小)
+    */
+    @ApiModelProperty("扣分范围(最小)")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围(最大)
+    */
+    @ApiModelProperty("扣分范围(最大)")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围(最小)
+    */
+    @ApiModelProperty("加分范围(最小)")
+    private Double addPointsMin;
+    /**
+    * 加分范围(最大)
+    */
+    @ApiModelProperty("加分范围(最大)")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

+ 119 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectVo.java

@@ -0,0 +1,119 @@
+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-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围(最小)
+    */
+    @ApiModelProperty("扣分范围(最小)")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围(最大)
+    */
+    @ApiModelProperty("扣分范围(最大)")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围(最小)
+    */
+    @ApiModelProperty("加分范围(最小)")
+    private Double addPointsMin;
+    /**
+    * 加分范围(最大)
+    */
+    @ApiModelProperty("加分范围(最大)")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

+ 77 - 1
src/main/resources/sqlScript/20231113_sql.sql

@@ -234,6 +234,7 @@ CREATE TABLE base_student_assessment_project
     `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 '基础分',
@@ -244,7 +245,7 @@ CREATE TABLE base_student_assessment_project
     `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[assessment_processing_method])',
+    `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:否)',
@@ -293,3 +294,78 @@ CREATE TABLE base_student_assessment_base_level
     `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_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_semester_id` bigint COMMENT '学期ID(base_semester)',
+    `grade_id` bigint NOT NULL COMMENT '入学年级(base_grade)',
+    `class_ids` varchar(10000) 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 '学生班级巡查考核-关联班级';
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 62 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -497,4 +497,66 @@ public class FreeMarkerGeneratorTest {
     }
 
 
+    /**
+     * 学生考核类别
+     */
+    @Test
+    public void gcBaseStudentAssessmentCategoryPost() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_assessment_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(true);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学生考核项目
+     */
+    @Test
+    public void gcBaseStudentAssessmentProject() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_assessment_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(false);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
 }