1、操行查询

2、班级考核增加移动端分页

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

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -12,6 +13,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentInspectionDto;
@@ -44,6 +46,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -65,17 +68,34 @@ public class BaseStudentAssessmentInspectionController {
     private final BaseStudentAssessmentProjectMapper baseStudentAssessmentProjectMapper;
     private final BaseStudentAssessmentCategoryMapper baseStudentAssessmentCategoryMapper;
     private final XjrUserMapper xjrUserMapper;
+    private final BaseClassMapper baseClassMapper;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="学生班级巡查考核列表(分页)")
     @SaCheckPermission("basestudentassessmentinspection:detail")
     public RT<PageOutput<BaseStudentAssessmentInspectionPageVo>> page(@Valid BaseStudentAssessmentInspectionPageDto dto){
 
-//        //未传流程状态不返回数据
-//        if(ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getStatus())){
-//            PageOutput<BaseStudentAssessmentInspectionPageVo> result = ConventPage.getPageOutputNull(BaseStudentAssessmentInspectionPageVo.class);
-//            return RT.ok(result);
-//        }
+        return RT.ok(getData(dto));
+    }
+
+    @GetMapping(value = "/mibliePage")
+    @ApiOperation(value="学生操行分记录管理列表(移动端分页)")
+    @SaCheckPermission("basestudentbehaviormanage:detail")
+    public RT<PageOutput<BaseStudentAssessmentInspectionPageVo>> mibliePage(@Valid BaseStudentAssessmentInspectionPageDto dto){
+        List<BaseClass> classList = baseClassMapper.selectList(
+                MPJWrappers.<BaseClass>lambdaJoin()
+                        .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
+                        .select(BaseClass.class, x -> VoToColumnUtil.fieldsToColumns(BaseClass.class).contains(x.getProperty()))
+        );
+        List<Long> classIds = new ArrayList<>();
+        for (BaseClass baseClass : classList) {
+            classIds.add(baseClass.getId());
+        }
+        dto.setClassIds(classIds);
+        return RT.ok(getData(dto));
+    }
+
+    PageOutput<BaseStudentAssessmentInspectionPageVo> getData(BaseStudentAssessmentInspectionPageDto dto){
         IPage<BaseStudentAssessmentInspectionPageVo> page = baseStudentAssessmentInspectionService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentAssessmentInspectionPageVo.class,
                 MPJWrappers.<BaseStudentAssessmentInspection>lambdaJoin()
                 .like(StrUtil.isNotEmpty(dto.getCreateUserName()), XjrUser::getName, dto.getCreateUserName())
@@ -83,6 +103,7 @@ public class BaseStudentAssessmentInspectionController {
                 .eq(StrUtil.isNotEmpty(dto.getEnrollType()), BaseClass::getEnrollType, dto.getEnrollType())
                 .eq(ObjectUtil.isNotNull(dto.getGradeId()), BaseClass::getGradeId, dto.getGradeId())
                 .eq(BaseStudentAssessmentInspection::getStatus, 1)
+                .in(ObjectUtil.isNotNull(dto.getClassIds()), BaseStudentAssessmentClassRelation::getClassId, dto.getClassIds())
                 .in(ObjectUtil.isNotNull(dto.getBaseStudentAssessmentProjectIds()), BaseStudentAssessmentInspection::getBaseStudentAssessmentProjectId, dto.getBaseStudentAssessmentProjectIds())
                 .between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), BaseStudentAssessmentInspection::getCreateDate,dto.getStartDate(),dto.getEndDate())
                 .in(ObjectUtil.isNotNull(dto.getBaseStudentAssessmentProjectIds()), BaseStudentAssessmentInspection::getBaseStudentAssessmentProjectId, dto.getBaseStudentAssessmentProjectIds())
@@ -107,8 +128,7 @@ public class BaseStudentAssessmentInspectionController {
                 .leftJoin(BaseStudentAssessmentClassRelation.class, BaseStudentAssessmentClassRelation::getBaseStudentAssessmentInspectionId, BaseStudentAssessmentInspection::getId)
         );
 
-        PageOutput<BaseStudentAssessmentInspectionPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionPageVo.class);
-        return RT.ok(pageOutput);
+        return ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionPageVo.class);
     }
 
     @GetMapping(value = "/moblieInfo")

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

@@ -0,0 +1,193 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorManageDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorManageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorStudentRelationMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorClassRelationVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorStudentRelationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @title: 学生操行分记录管理
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseStudentBehaviorManage")
+@Api(value = "/student"  + "/baseStudentBehaviorManage",tags = "学生操行分记录管理代码")
+@AllArgsConstructor
+public class BaseStudentBehaviorManageController {
+
+
+    private final IBaseStudentBehaviorManageService baseStudentBehaviorManageService;
+    private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorClassRelationMapper;
+    private final BaseStudentBehaviorStudentRelationMapper baseStudentBehaviorStudentRelationMapper;
+    private final BaseClassMapper baseClassMapper;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生操行分记录管理列表(分页)")
+    @SaCheckPermission("basestudentbehaviormanage:detail")
+    public RT<PageOutput<BaseStudentBehaviorManagePageVo>> page(@Valid BaseStudentBehaviorManagePageDto dto){
+        return RT.ok(getData(dto));
+    }
+
+    @GetMapping(value = "/mibliePage")
+    @ApiOperation(value="学生操行分记录管理列表(移动端分页)")
+    @SaCheckPermission("basestudentbehaviormanage:detail")
+    public RT<PageOutput<BaseStudentBehaviorManagePageVo>> mibliePage(@Valid BaseStudentBehaviorManagePageDto dto){
+
+        List<BaseClass> classList = baseClassMapper.selectList(
+                MPJWrappers.<BaseClass>lambdaJoin()
+                .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
+                .select(BaseClass.class, x -> VoToColumnUtil.fieldsToColumns(BaseClass.class).contains(x.getProperty()))
+        );
+        List<Long> classIds = new ArrayList<>();
+        for (BaseClass baseClass : classList) {
+            classIds.add(baseClass.getId());
+        }
+        dto.setClassIds(classIds);
+        return RT.ok(getData(dto));
+    }
+
+    PageOutput<BaseStudentBehaviorManagePageVo> getData(BaseStudentBehaviorManagePageDto dto){
+        IPage<BaseStudentBehaviorManagePageVo> page = baseStudentBehaviorManageService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentBehaviorManagePageVo.class,
+                MPJWrappers.<BaseStudentBehaviorManage>lambdaJoin()
+                .like(StrUtil.isNotEmpty(dto.getName()), BaseStudentBehaviorStudentRelation::getName, dto.getName())
+                .like(ObjectUtil.isNotNull(dto.getSemesterId()), BaseStudentBehaviorManage::getBaseSemesterId, dto.getSemesterId())
+                .in(ObjectUtil.isNotNull(dto.getBehaviorCategoryIds()), BaseStudentBehaviorManage::getBaseStudentBehaviorCategoryId, dto.getBehaviorCategoryIds())
+                .in(ObjectUtil.isNotNull(dto.getBehaviorProjectIds()), BaseStudentBehaviorManage::getBaseStudentBehaviorProjectId, dto.getBehaviorProjectIds())
+                .in(ObjectUtil.isNotNull(dto.getOrgIds()), Department::getId, dto.getOrgIds())
+                .in(ObjectUtil.isNotNull(dto.getGradeIds()), BaseStudentBehaviorManage::getGradeId, dto.getGradeIds())
+                .in(ObjectUtil.isNotNull(dto.getMajorSetIds()), BaseStudentSchoolRoll::getMajorSetId, dto.getMajorSetIds())
+                .in(ObjectUtil.isNotNull(dto.getClassIds()), BaseStudentBehaviorClassRelation::getClassId, dto.getClassIds())
+                .like(StrUtil.isNotEmpty(dto.getModifyUserName()), "t.modify_user_id = (select id from xjr_user where name like concat('%',?,'%'))", dto.getModifyUserName())
+                .like(StrUtil.isNotEmpty(dto.getCreateUserName()), "t.create_user_id = (select id from xjr_user where name like concat('%',?,'%'))", dto.getCreateUserName())
+                .eq(BaseStudentBehaviorManage::getStatus, 1)
+                .eq(ObjectUtil.isNotNull(dto.getIsAffect()), BaseStudentBehaviorManage::getIsAffect, dto.getIsAffect())
+                .select(BaseStudentBehaviorManage::getId)
+                .select(BaseStudentBehaviorStudentRelation::getClassName)
+                .select(BaseStudentBehaviorStudentRelation::getName)
+                .select(BaseStudentBehaviorProject::getScoreType)
+                .select(BaseStudentBehaviorStudentRelation::getStudentId)
+                .select(BaseStudentBehaviorStudentRelation::getSortCode)
+                .select(BaseStudentBehaviorManage::getFileId)
+                .select(BaseStudentBehaviorManage::getAssessmentAddress)
+                .select(BaseStudentBehaviorManage::getAssessmentDate)
+                .select(BaseStudentBehaviorManage::getScore)
+                .select(BaseStudentBehaviorManage::getScoreNumber)
+                .select(BaseStudentBehaviorManage::getTotalScore)
+                .select(BaseStudentBehaviorManage::getIsAffect)
+                .selectAs(BaseStudentBehaviorCategory::getName, BaseStudentBehaviorManagePageVo::getBehaviorCategoryName)
+                .selectAs(BaseStudentBehaviorProject::getName, BaseStudentBehaviorManagePageVo::getBehaviorProjectName)
+                .selectAs(BaseStudentBehaviorProject::getName, BaseStudentBehaviorManagePageVo::getBehaviorProjectName)
+                .innerJoin(BaseStudentBehaviorCategory.class, BaseStudentBehaviorCategory::getId, BaseStudentBehaviorManage::getBaseStudentBehaviorCategoryId)
+                .innerJoin(BaseStudentBehaviorProject.class, BaseStudentBehaviorProject::getId, BaseStudentBehaviorManage::getBaseStudentBehaviorProjectId)
+                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentBehaviorManage::getBaseSemesterId)
+                .innerJoin(BaseStudentBehaviorStudentRelation.class, BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, BaseStudentBehaviorManage::getId)
+                .innerJoin(BaseStudentBehaviorClassRelation.class, BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, BaseStudentBehaviorManage::getId)
+                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentBehaviorClassRelation::getClassId)
+                .innerJoin(Department.class, Department::getId, BaseClass::getOrgId)
+                .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentBehaviorStudentRelation::getUserId)
+        );
+        return ConventPage.getPageOutput(page, BaseStudentBehaviorManagePageVo.class);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生操行分记录管理信息")
+    @SaCheckPermission("basestudentbehaviormanage:detail")
+    public RT<BaseStudentBehaviorManageVo> info(@RequestParam Long id){
+        BaseStudentBehaviorManage baseStudentBehaviorManage = baseStudentBehaviorManageService.getById(id);
+        if (baseStudentBehaviorManage == null) {
+           return RT.error("找不到此数据！");
+        }
+        BaseStudentBehaviorManageVo behaviorManageVo = BeanUtil.toBean(baseStudentBehaviorManage, BaseStudentBehaviorManageVo.class);
+        //查询班级
+        List<BaseStudentBehaviorClassRelation> classList = baseStudentBehaviorClassRelationMapper.selectList(
+                MPJWrappers.<BaseStudentBehaviorClassRelation>lambdaJoin()
+                .eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, id)
+                .selectAs(BaseClass::getName, BaseStudentBehaviorClassRelationVo::getClassName)
+                .select(BaseStudentBehaviorClassRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorClassRelation.class).contains(x.getProperty()))
+                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentBehaviorClassRelation::getClassId)
+        );
+        behaviorManageVo.setBaseStudentBehaviorClassRelationList(BeanUtil.copyToList(classList, BaseStudentBehaviorClassRelationVo.class));
+        //查询学生
+        List<BaseStudentBehaviorStudentRelation> studentList = baseStudentBehaviorStudentRelationMapper.selectList(
+                MPJWrappers.<BaseStudentBehaviorStudentRelation>lambdaJoin()
+                .eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, id)
+                .select(BaseStudentBehaviorStudentRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorStudentRelation.class).contains(x.getProperty()))
+        );
+        behaviorManageVo.setBaseStudentBehaviorStudentRelationList(BeanUtil.copyToList(studentList, BaseStudentBehaviorStudentRelationVo.class));
+
+        return RT.ok(behaviorManageVo);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生操行分记录管理")
+    @SaCheckPermission("basestudentbehaviormanage:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorManageDto dto){
+        BaseStudentBehaviorManage baseStudentBehaviorManage = BeanUtil.toBean(dto, BaseStudentBehaviorManage.class);
+        boolean isSuccess = baseStudentBehaviorManageService.add(baseStudentBehaviorManage);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生操行分记录管理")
+    @SaCheckPermission("basestudentbehaviormanage:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorManageDto dto){
+
+        BaseStudentBehaviorManage baseStudentBehaviorManage = BeanUtil.toBean(dto, BaseStudentBehaviorManage.class);
+        return RT.ok(baseStudentBehaviorManageService.update(baseStudentBehaviorManage));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生操行分记录管理")
+    @SaCheckPermission("basestudentbehaviormanage:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBehaviorManageService.delete(ids));
+
+    }
+
+}

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

@@ -0,0 +1,48 @@
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorClassRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+}

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

@@ -0,0 +1,125 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+
+
+
+/**
+* @title: 学生操行分记录管理
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorManageDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生操行分考核类别编号（base_student_behavior_category）
+    */
+    @ApiModelProperty("学生操行分考核类别编号（base_student_behavior_category）")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 学生操行分考核项目编号（base_student_behavior_project）
+    */
+    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级Ids(多选)
+    */
+    @ApiModelProperty("班级Ids(多选)")
+    private String classIds;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 考核用户ID(xjr_user)
+    */
+    @ApiModelProperty("考核用户ID(xjr_user)")
+    private Long assessmentUserId;
+    /**
+    * 考核机构(xjr_department)
+    */
+    @ApiModelProperty("考核机构(xjr_department)")
+    private Long assessmentDepartmentId;
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+    /**
+    * baseStudentBehaviorStudentRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorStudentRelation子表")
+    private List<AddBaseStudentBehaviorStudentRelationDto> baseStudentBehaviorStudentRelationList;
+    /**
+    * baseStudentBehaviorClassRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorClassRelation子表")
+    private List<AddBaseStudentBehaviorClassRelationDto> baseStudentBehaviorClassRelationList;
+}

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

@@ -0,0 +1,73 @@
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorStudentRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 所在班级
+    */
+    @ApiModelProperty("所在班级")
+    private String className;
+    /**
+    * 所学专业
+    */
+    @ApiModelProperty("所学专业")
+    private String majorName;
+
+}

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

@@ -62,5 +62,8 @@ public class BaseStudentAssessmentInspectionPageDto extends PageInput {
     @ApiModelProperty("考核人")
     private String assessmentUserName;
 
+    @ApiModelProperty("班级ids")
+    private List<Long> classIds;
+
 
 }

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

@@ -0,0 +1,97 @@
+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;
+import java.util.List;
+
+
+/**
+* @title: 学生操行分记录管理分页查询入参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorManagePageDto extends PageInput {
+
+    /**
+     * 是否影响
+     */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+
+    /**
+     * 学生
+     */
+    @ApiModelProperty("学生")
+    private String name;
+
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private Long semesterId;
+
+    /**
+     * 考核类别ids
+     */
+    @ApiModelProperty("考核类别ids")
+    private List<Long> behaviorCategoryIds;
+
+    /**
+     * 考核项目ids
+     */
+    @ApiModelProperty("考核项目ids")
+    private List<Long> behaviorProjectIds;
+
+    /**
+     * 考核类型
+     */
+    @ApiModelProperty("考核类型")
+    private String scoreType;
+
+    /**
+     * 组织结构ids
+     */
+    @ApiModelProperty("组织结构ids")
+    private List<Long> orgIds;
+
+    /**
+     * 年级ids
+     */
+    @ApiModelProperty("年级ids")
+    private List<Long> gradeIds;
+
+    /**
+     * 专业ids
+     */
+    @ApiModelProperty("专业ids")
+    private List<Long> majorSetIds;
+
+    /**
+     * 班级ids
+     */
+    @ApiModelProperty("班级ids")
+    private List<Long> classIds;
+
+    /**
+     * 修改人
+     */
+    @ApiModelProperty("修改人")
+    private String modifyUserName;
+
+    /**
+     * 等级人
+     */
+    @ApiModelProperty("等级人")
+    private String createUserName;
+}

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

@@ -0,0 +1,34 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+
+
+
+/**
+* @title: 学生操行分记录管理
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentBehaviorManageDto extends AddBaseStudentBehaviorManageDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_class_relation")
+@ApiModel(value = "学生班级巡查考核-关联班级对象", description = "学生班级巡查考核-关联班级")
+public class BaseStudentBehaviorClassRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("班级名称")
+    private String className;
+
+
+}

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

@@ -0,0 +1,177 @@
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_manage")
+@ApiModel(value = "学生操行分记录管理对象", description = "学生操行分记录管理")
+public class BaseStudentBehaviorManage 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;
+    /**
+    * 学生操行分考核项目编号（base_student_behavior_project）
+    */
+    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级Ids(多选)
+    */
+    @ApiModelProperty("班级Ids(多选)")
+    private String classIds;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 考核用户ID(xjr_user)
+    */
+    @ApiModelProperty("考核用户ID(xjr_user)")
+    private Long assessmentUserId;
+    /**
+    * 考核机构(xjr_department)
+    */
+    @ApiModelProperty("考核机构(xjr_department)")
+    private Long assessmentDepartmentId;
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+    /**
+    * baseStudentBehaviorStudentRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorStudentRelation子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "baseStudentBehaviorManageId")
+    private List<BaseStudentBehaviorStudentRelation> baseStudentBehaviorStudentRelationList;
+    /**
+    * baseStudentBehaviorClassRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorClassRelation子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "baseStudentBehaviorManageId")
+    private List<BaseStudentBehaviorClassRelation> baseStudentBehaviorClassRelationList;
+
+}

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

@@ -0,0 +1,86 @@
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_student_relation")
+@ApiModel(value = "学生班级巡查考核-关联学生对象", description = "学生班级巡查考核-关联学生")
+public class BaseStudentBehaviorStudentRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 所在班级
+    */
+    @ApiModelProperty("所在班级")
+    private String className;
+    /**
+    * 所学专业
+    */
+    @ApiModelProperty("所学专业")
+    private String majorName;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorClassRelationMapper.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.BaseStudentBehaviorClassRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorClassRelationMapper extends MPJBaseMapper<BaseStudentBehaviorClassRelation> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorManageMapper.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.BaseStudentBehaviorManage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生操行分记录管理
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorManageMapper extends MPJBaseMapper<BaseStudentBehaviorManage> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorStudentRelationMapper.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.BaseStudentBehaviorStudentRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生班级巡查考核-关联学生
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorStudentRelationMapper extends MPJBaseMapper<BaseStudentBehaviorStudentRelation> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorClassRelationService extends IService<BaseStudentBehaviorClassRelation> {
+    /**
+     * 数据缓存
+     *
+     * @return
+     */
+    Boolean dataCache(Long dataId);
+}

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

@@ -0,0 +1,40 @@
+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.BaseStudentBehaviorManage;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生操行分记录管理
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorManageService extends MPJBaseService<BaseStudentBehaviorManage> {
+    /**
+    * 新增
+    *
+    * @param baseStudentBehaviorManage
+    * @return
+    */
+    Boolean add(BaseStudentBehaviorManage baseStudentBehaviorManage);
+
+    /**
+    * 更新
+    *
+    * @param baseStudentBehaviorManage
+    * @return
+    */
+    Boolean update(BaseStudentBehaviorManage baseStudentBehaviorManage);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

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

@@ -0,0 +1,61 @@
+package com.xjrsoft.module.student.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorClassRelationService;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorClassRelationServiceImpl extends ServiceImpl<BaseStudentBehaviorClassRelationMapper, BaseStudentBehaviorClassRelation> implements IBaseStudentBehaviorClassRelationService {
+
+    private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorClassRelationMapper;
+    private final IBaseStudentBehaviorManageService baseStudentBehaviorManageService;
+    private final XjrUserMapper xjrUserMapper;
+
+    @Override
+    public Boolean dataCache(Long dataId) {
+        BaseStudentBehaviorManage behaviorManage = baseStudentBehaviorManageService.getById(dataId);
+        List<String> classIdList = StrUtil.split(behaviorManage.getClassIds(), ",");
+
+        for (String classId : classIdList) {
+            BaseStudentBehaviorClassRelation classRelation = new BaseStudentBehaviorClassRelation();
+            Long classIdAsLong = Long.valueOf(classId);
+            classRelation.setClassId(classIdAsLong);
+            classRelation.setBaseStudentBehaviorManageId(dataId);
+
+            //根据班主任id查询出班主任的名字
+            XjrUser xjrUser = xjrUserMapper.selectOne(
+                    MPJWrappers.<XjrUser>lambdaJoin()
+                    .eq(BaseClass::getId, classIdAsLong)
+                    .innerJoin(BaseClass.class, BaseClass::getTeacherId, XjrUser::getId)
+            );
+
+            if(ObjectUtil.isNotNull(xjrUser)){
+                classRelation.setTeacherName(xjrUser.getName());
+            }
+
+            baseStudentBehaviorClassRelationMapper.insert(classRelation);
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,125 @@
+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.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorStudentRelationMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorManageMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<BaseStudentBehaviorManageMapper, BaseStudentBehaviorManage> implements IBaseStudentBehaviorManageService {
+    private final BaseStudentBehaviorManageMapper baseStudentBehaviorManageBaseStudentBehaviorManageMapper;
+
+    private final BaseStudentBehaviorStudentRelationMapper baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper;
+    private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(BaseStudentBehaviorManage baseStudentBehaviorManage) {
+        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.insert(baseStudentBehaviorManage);
+        for (BaseStudentBehaviorStudentRelation baseStudentBehaviorStudentRelation : baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList()) {
+            baseStudentBehaviorStudentRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
+            baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
+        }
+        for (BaseStudentBehaviorClassRelation baseStudentBehaviorClassRelation : baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList()) {
+            baseStudentBehaviorClassRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
+            baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(BaseStudentBehaviorManage baseStudentBehaviorManage) {
+        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.updateById(baseStudentBehaviorManage);
+        //********************************* BaseStudentBehaviorStudentRelation  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BaseStudentBehaviorStudentRelation> baseStudentBehaviorStudentRelationList = baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorStudentRelation::getId));
+            List<Long> baseStudentBehaviorStudentRelationIds = baseStudentBehaviorStudentRelationList.stream().map(BaseStudentBehaviorStudentRelation::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> baseStudentBehaviorStudentRelationOldIds = baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList().stream().map(BaseStudentBehaviorStudentRelation::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> baseStudentBehaviorStudentRelationRemoveIds = baseStudentBehaviorStudentRelationIds.stream().filter(item -> !baseStudentBehaviorStudentRelationOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BaseStudentBehaviorStudentRelation baseStudentBehaviorStudentRelation : baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList()) {
+                //如果不等于空则修改
+                if (baseStudentBehaviorStudentRelation.getId() != null) {
+                    baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.updateById(baseStudentBehaviorStudentRelation);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    baseStudentBehaviorStudentRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
+                    baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
+                }
+            }
+            //已经不存在的id 删除
+            if(baseStudentBehaviorStudentRelationRemoveIds.size() > 0){
+                baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.deleteBatchIds(baseStudentBehaviorStudentRelationRemoveIds);
+            }
+        }
+        //********************************* BaseStudentBehaviorStudentRelation  增删改  结束 *******************************************/
+
+        //********************************* BaseStudentBehaviorClassRelation  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BaseStudentBehaviorClassRelation> baseStudentBehaviorClassRelationList = baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorClassRelation::getId));
+            List<Long> baseStudentBehaviorClassRelationIds = baseStudentBehaviorClassRelationList.stream().map(BaseStudentBehaviorClassRelation::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> baseStudentBehaviorClassRelationOldIds = baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList().stream().map(BaseStudentBehaviorClassRelation::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> baseStudentBehaviorClassRelationRemoveIds = baseStudentBehaviorClassRelationIds.stream().filter(item -> !baseStudentBehaviorClassRelationOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BaseStudentBehaviorClassRelation baseStudentBehaviorClassRelation : baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList()) {
+                //如果不等于空则修改
+                if (baseStudentBehaviorClassRelation.getId() != null) {
+                    baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.updateById(baseStudentBehaviorClassRelation);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    baseStudentBehaviorClassRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
+                    baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
+                }
+            }
+            //已经不存在的id 删除
+            if(baseStudentBehaviorClassRelationRemoveIds.size() > 0){
+                baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.deleteBatchIds(baseStudentBehaviorClassRelationRemoveIds);
+            }
+        }
+        //********************************* BaseStudentBehaviorClassRelation  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.deleteBatchIds(ids);
+        baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).in(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, ids));
+        baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).in(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学生班级巡查考核-关联班级表单出参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorClassRelationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+
+    @ApiModelProperty("班级名称")
+    private String className;
+
+
+}

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

@@ -0,0 +1,173 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生操行分记录管理分页列表出参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorManagePageVo {
+
+    /**
+    * 主键编号
+    */
+    @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;
+    /**
+    * 学生操行分考核项目编号（base_student_behavior_project）
+    */
+    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级Ids(多选)
+    */
+    @ApiModelProperty("班级Ids(多选)")
+    private String classIds;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 考核用户ID(xjr_user)
+    */
+    @ApiModelProperty("考核用户ID(xjr_user)")
+    private Long assessmentUserId;
+    /**
+    * 考核机构(xjr_department)
+    */
+    @ApiModelProperty("考核机构(xjr_department)")
+    private Long assessmentDepartmentId;
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    private String name;
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+     * 学期
+     */
+    @ApiModelProperty("学期")
+    private String semesterName;
+    /**
+     * 考核类别
+     */
+    @ApiModelProperty("考核类别")
+    private String behaviorCategoryName;
+    /**
+     * 考核项目
+     */
+    @ApiModelProperty("考核项目")
+    private String behaviorProjectName;
+
+    /**
+     * 考核类型
+     */
+    @ApiModelProperty("考核类型")
+    private String scoreType;
+}

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

@@ -0,0 +1,126 @@
+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;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
+
+/**
+* @title: 学生操行分记录管理表单出参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorManageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生操行分考核类别编号（base_student_behavior_category）
+    */
+    @ApiModelProperty("学生操行分考核类别编号（base_student_behavior_category）")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 学生操行分考核项目编号（base_student_behavior_project）
+    */
+    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级Ids(多选)
+    */
+    @ApiModelProperty("班级Ids(多选)")
+    private String classIds;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 考核用户ID(xjr_user)
+    */
+    @ApiModelProperty("考核用户ID(xjr_user)")
+    private Long assessmentUserId;
+    /**
+    * 考核机构(xjr_department)
+    */
+    @ApiModelProperty("考核机构(xjr_department)")
+    private Long assessmentDepartmentId;
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+    /**
+    * baseStudentBehaviorStudentRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorStudentRelation子表")
+    private List<BaseStudentBehaviorStudentRelationVo> baseStudentBehaviorStudentRelationList;
+    /**
+    * baseStudentBehaviorClassRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorClassRelation子表")
+    private List<BaseStudentBehaviorClassRelationVo> baseStudentBehaviorClassRelationList;
+
+}

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

@@ -0,0 +1,74 @@
+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 dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorStudentRelationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 学生操行分记录管理id
+    */
+    @ApiModelProperty("学生操行分记录管理id")
+    private Long baseStudentBehaviorManageId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 所在班级
+    */
+    @ApiModelProperty("所在班级")
+    private String className;
+    /**
+    * 所学专业
+    */
+    @ApiModelProperty("所学专业")
+    private String majorName;
+
+
+
+}

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

@@ -683,6 +683,53 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学生考核项目
+     */
+    @Test
+    public void gcBaseStudentBehaviorManage() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_behavior_manage");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_student_behavior_student_relation");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("base_student_behavior_manage_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_student_behavior_class_relation");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("base_student_behavior_manage_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        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);