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

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

@@ -85,7 +85,7 @@ public class BaseStudentBehaviorProjectController {
         LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .orderByDesc(BaseStudentBehaviorProject::getId)
-                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentAssessmentProjectId, dto.getBaseStudentBehaviorCategoryId())
+                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentBehaviorCategoryId, dto.getBaseStudentBehaviorCategoryId())
                 .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
         IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);

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

@@ -411,6 +411,7 @@ CREATE TABLE base_student_behavior_manage
     `is_affect` INT NULL DEFAULT 0 COMMENT '是否影响(1:是 0:否)',
     `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
     `assessment_department_id` bigint NOT NULL COMMENT '考核机构(xjr_department)',
+    `assessment_address` varchar(1000) NULL DEFAULT NULL COMMENT '考核地点',
     `remark` VARCHAR(1000) COMMENT '备注',
     `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
     `status` INT NOT NULL default 0 COMMENT '状态（1:结束 0:未结束）',
@@ -431,8 +432,8 @@ CREATE TABLE base_student_behavior_student_relation
     `name` VARCHAR(30) NULL DEFAULT NULL COMMENT '姓名',
     `gender` VARCHAR(30) NULL DEFAULT 1 COMMENT '性别',
     `nation` VARCHAR(30) NULL DEFAULT NULL COMMENT '民族(xjr_dictionary_item[nation])',
-    `class` VARCHAR(50) NULL DEFAULT NULL COMMENT '所在班级',
-    `major` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
+    `class_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '所在班级',
+    `major_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联学生';