Merge branch 'pre'

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplatePlanDto.java

@@ -54,7 +54,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     /**
      * 选人方式
      */
-    @ApiModelProperty("选人方式(全部：all 随机：random)")
+    @ApiModelProperty("选人方式(全部：all 随机：random 指定：appoint)")
     private String type;
 
     /**
@@ -69,4 +69,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     @ApiModelProperty("学期id(base_semester)")
     private Long baseSemesterId;
 
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
+
 }

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -111,7 +111,7 @@ public class AssessmentTemplatePlan implements Serializable {
     /**
      * 选人方式
      */
-    @ApiModelProperty("选人方式(全部：all 随机：random)")
+    @ApiModelProperty("选人方式(全部：all 随机：random 指定：appoint)")
     private String type;
 
     /**
@@ -142,4 +142,11 @@ public class AssessmentTemplatePlan implements Serializable {
     @EntityMapping(thisField = "id", joinField = "assessmentTemplatePlanId")
     private List<AssessmentPlanAnswerStudent> assessmentPlanAnswerStudentList;
 
+
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
+
+    @ApiModelProperty("是否需要班主任确认(0:否 1:是)")
+    private Integer isNeedConfirm;
+
 }

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -130,6 +130,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
             for (BaseClass baseClass : classList) {
                 classIds.add(baseClass.getId());
             }
+            dto.setClassIds(classIds);
         }else if("random".equals(dto.getType())){
             List<Integer> randomList = new ArrayList<>();
             Random random = new Random();
@@ -143,8 +144,9 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
             for (Integer i : randomList) {
                 classIds.add(classList.get(i).getId());
             }
+            dto.setClassIds(classIds);
         }
-        dto.setClassIds(classIds);
+
         //存入班级，并根据选人方式存入答题学生
         for (Long classId : dto.getClassIds()) {
             AssessmentPlanAnswerClass answerClass = new AssessmentPlanAnswerClass();

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -55,6 +55,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.time.DayOfWeek;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -162,13 +163,19 @@ public class ScheduleController {
     @ApiOperation(value="获取当前周次")
     @SaCheckPermission("schedule:detail")
     public RT<Integer> currentWeek(CourseTableDto dto){
+        LocalDateTime now = LocalDateTime.now();
         List<BaseSemester> semesterList = semesterService.list(
                 new QueryWrapper<BaseSemester>().lambda()
                         .eq(BaseSemester::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .le(BaseSemester::getEndDate, now)
+                        .ge(BaseSemester::getStartDate, now)
                         .orderByDesc(BaseSemester::getStartDate)
         );
+        if(semesterList.isEmpty()){
+            return RT.error("未能查询到当前周次");
+        }
         BaseSemester baseSemester = semesterList.get(0);
-        LocalDateTime now = LocalDateTime.now();
+
         if(dto.getScheduleDate() != null){
             now = dto.getScheduleDate();
         }

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -30,8 +30,9 @@
         t1.assessment_template_id,t3.is_confirm,t3.submit_status FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         LEFT JOIN assessment_plan_answer_student t3 ON t3.assessment_template_plan_id = t1.id
+        left join base_student_school_roll t4 on t3.student_user_id = t4.user_id
         WHERE t1.delete_mark = 0 AND t1.status = 1 AND t3.student_user_id = #{dto.studentUserId}
-        and t3.is_confirm = 1
+        and t3.is_confirm = 1 and t1.stduy_status = t4.stduy_status
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>

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

@@ -0,0 +1,49 @@
+-- -----------------------------------------------------------------------------------
+-- 评价题目表中增加题目类型和选项内容
+-- ----------------------------------------------------------------------------------- 
+ALTER TABLE `evaluate_item`   
+  ADD COLUMN `type` VARCHAR(50) NULL   COMMENT '题目类型' AFTER `input_not_null`,
+  ADD COLUMN `option_json` TEXT NULL   COMMENT '选项内容' AFTER `type`;
+  
+
+-- -----------------------------------------------------------------------------------
+-- 评价题目表中增加题目类型和选项内容
+-- ----------------------------------------------------------------------------------- 
+ALTER TABLE `evaluate_manage_item`   
+  ADD COLUMN `type` VARCHAR(50) NULL   COMMENT '题目类型' AFTER `input_not_null`,
+  ADD COLUMN `option_json` TEXT NULL   COMMENT '选项内容' AFTER `type`;
+
+
+-- -----------------------------------------------------------------------------------
+-- 可是统计增加：课时补充数据，表头动态
+-- ----------------------------------------------------------------------------------- 
+DROP PROCEDURE IF EXISTS createCom;
+DELIMITER $$
+CREATE
+    PROCEDURE createCom()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM information_schema.columns  WHERE table_name='class_time_statistics_record' AND COLUMN_NAME = 'course_time_type_data') THEN
+ALTER TABLE `class_time_statistics_record`   
+  ADD COLUMN `course_time_type_data` LONGTEXT NULL   COMMENT '课时补充数据，表头动态' AFTER `all_class_time_data`;
+END IF;
+END$$
+DELIMITER ;
+CALL createCom;
+DROP PROCEDURE createCom;
+
+
+DROP PROCEDURE IF EXISTS createCom;
+DELIMITER $$
+CREATE
+    PROCEDURE createCom()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM information_schema.columns  WHERE table_name='evaluate_result' AND COLUMN_NAME = 'option_content') THEN
+ALTER TABLE `evaluate_result`   
+  ADD COLUMN `option_content` VARCHAR(500) NULL   COMMENT '选项内容' AFTER `submit_record_id`;
+END IF;
+END$$
+DELIMITER ;
+CALL createCom;
+DROP PROCEDURE createCom;
+
+

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

@@ -0,0 +1,55 @@
+-- -----------------------------------------------------------------------------------
+-- 课时统计表增加字段：统计类型
+-- ----------------------------------------------------------------------------------- 
+DROP PROCEDURE IF EXISTS createCom;
+DELIMITER $$
+CREATE
+    PROCEDURE createCom()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM information_schema.columns  WHERE table_name='class_time_statistics' AND COLUMN_NAME = 'category') THEN
+ALTER TABLE `class_time_statistics`   
+  ADD COLUMN `category` INT DEFAULT 1 COMMENT '课时统计类型(1:全课时 2:课表课时)';
+END IF;
+END$$
+DELIMITER ;
+CALL createCom;
+DROP PROCEDURE createCom;
+
+
+ALTER TABLE `class_time_statistics_record`   
+  CHANGE `class_time1` `class_time1` INT NULL   COMMENT '总周次',
+  CHANGE `class_time2` `class_time2` DOUBLE(8,2) NULL   COMMENT '周平均课时',
+  CHANGE `class_time3` `class_time3` DOUBLE(8,2) NULL   COMMENT '行政工作量',
+  CHANGE `class_time4` `class_time4` DOUBLE(8,2) NULL   COMMENT '总平均课时',
+  CHANGE `class_time5` `class_time5` DOUBLE(8,2) NULL   COMMENT '工作量得分',
+  CHANGE `class_time6` `class_time6` DOUBLE(8,2) NULL   COMMENT '超工作量得分';
+
+ALTER TABLE `class_time_statistics`   
+  ADD COLUMN `weeks` INT NULL   COMMENT '总周次' AFTER `category`;
+
+
+-- ---------------------------------------------------------------------------------
+-- 课时量统计-行政工作量
+-- ---------------------------------------------------------------------------------
+DROP TABLE IF EXISTS class_time_statistics_administration;
+CREATE TABLE `class_time_statistics_administration` (
+  `id` BIGINT NOT NULL COMMENT '主键编号',
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改时间',
+  `delete_mark` INT NOT NULL COMMENT '删除标记',
+  `enabled_mark` INT NOT NULL COMMENT '有效标志',
+  `user_id` BIGINT DEFAULT NULL COMMENT '用户id(xjr_user)',
+  `workload` DOUBLE(8,2) DEFAULT NULL COMMENT '工作量',
+  `class_time_statistics_id` BIGINT DEFAULT NULL COMMENT '课时统计id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='课时量统计-行政工作量';
+
+ALTER TABLE `class_time_statistics`
+  ADD COLUMN `over_workload_number_status` INT NULL COMMENT '超工作量基数状态(1:锁定 0:解锁)',
+  ADD COLUMN `over_workload_number` DOUBLE(8,2) NULL COMMENT '超工作量基数';
+  
+ALTER TABLE `class_time_statistics`   
+  CHANGE `over_workload_number_status` `over_workload_number_status` INT DEFAULT 0  NULL   COMMENT '超工作量基数状态(1:锁定 0:解锁)';
+

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

@@ -0,0 +1,6 @@
+ALTER TABLE `teacher_award`   
+  ADD COLUMN `event_name` VARCHAR(100) NULL   COMMENT '赛事名称' AFTER `award_date`;
+
+
+ALTER TABLE `patrol_offline_courses`   
+  ADD COLUMN `situation` VARCHAR(500) NULL   COMMENT '上课状态';

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

@@ -0,0 +1,52 @@
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `student_id` BIGINT NULL   COMMENT '学号';
+  
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `user_id` BIGINT NULL   COMMENT '用户';
+
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `teacher_id` BIGINT NULL   COMMENT '班主任id';
+  
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `class_name` VARCHAR(100) NULL   COMMENT '班级名称';
+
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `name` VARCHAR(100) NULL   COMMENT '姓名';
+
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `gender` VARCHAR(100) NULL   COMMENT '性别';
+
+ALTER TABLE `base_student_punishment_info`   
+  ADD COLUMN `nation` VARCHAR(100) NULL   COMMENT '民族';
+
+DROP TABLE base_punishment_student_relation;
+
+-- ---------------------------------------------------------------------------------
+-- 课时量统计-行政工作量
+-- ---------------------------------------------------------------------------------
+DROP TABLE IF EXISTS base_punishment_student_handle;
+CREATE TABLE `base_punishment_student_handle` (
+  `id` BIGINT NOT NULL COMMENT '主键编号',
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改时间',
+  `delete_mark` INT NOT NULL COMMENT '删除标记',
+  `enabled_mark` INT NOT NULL COMMENT '有效标志',
+  `adjust_reason` VARCHAR(500) DEFAULT NULL COMMENT '调整原因',
+  `adjust_date` DATE DEFAULT NULL COMMENT '调整日期',
+  `adjust_type` INT DEFAULT NULL COMMENT '调整类型 1:升级 2:降级 3:撤销',
+  `base_student_punishment_info_id` BIGINT DEFAULT NULL COMMENT '学生处分id(base_punishment_student_relation)',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生处分处理表';
+
+ALTER TABLE `base_punishment_student_handle`   
+  ADD INDEX (`base_student_punishment_info_id`);
+  
+ALTER TABLE `visitor_out_in_record`   
+  CHANGE `record_time` `record_time` DATETIME NULL   COMMENT '记录时间';
+
+ALTER TABLE `base_punishment_student_handle`   
+  ADD COLUMN `punishment_type_id` BIGINT NULL AFTER `base_student_punishment_info_id`;
+
+

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

@@ -0,0 +1,33 @@
+ALTER TABLE `course_table`   
+  ADD COLUMN `course_receive_msg_id` BIGINT NULL   COMMENT '同步记录id' AFTER `key_info`;
+  
+ALTER TABLE `teacher_attendance_record`   
+  ADD INDEX (`user_id`);
+
+ALTER TABLE  `wf_course_adjust`   
+  CHANGE `exchange_teacher_id` `exchange_teacher_id` VARCHAR(25) NULL   COMMENT '替班教师id(xjr_user)';
+
+
+ALTER TABLE `base_teacher`   
+  ADD COLUMN `is_normal` INT DEFAULT 1 COMMENT '是否正常数据(1:是 0:否)';
+
+ALTER TABLE `base_student`   
+  ADD COLUMN `is_normal` INT DEFAULT 1 COMMENT '是否正常数据(1:是 0:否)';
+
+ALTER TABLE  `xjr_dictionary_detail`   
+  ADD COLUMN `extend_field1` VARCHAR(1000) NULL   COMMENT '扩展字段1' AFTER `p_id`,
+  ADD COLUMN `extend_field2` VARCHAR(1000) NULL   COMMENT '扩展字段2' AFTER `extend_field1`,
+  ADD COLUMN `extend_field3` VARCHAR(1000) NULL   COMMENT '扩展字段3' AFTER `extend_field2`,
+  ADD COLUMN `extend_field4` VARCHAR(1000) NULL   COMMENT '扩展字段4' AFTER `extend_field3`,
+  ADD COLUMN `extend_field5` VARCHAR(1000) NULL   COMMENT '扩展字段5' AFTER `extend_field4`;
+
+ALTER TABLE`assessment_plan_answer_class`   
+  ADD INDEX (`class_id`),
+  ADD INDEX (`assessment_template_plan_id`);
+
+ALTER TABLE `assessment_plan_answer_student`   
+  ADD INDEX (`student_user_id`),
+  ADD INDEX (`assessment_template_plan_id`);
+
+ALTER TABLE `wf_repair_declaration`   
+  ADD COLUMN `fee_prove` BIGINT  NULL COMMENT '缴费证明' AFTER `status`;

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

@@ -0,0 +1,6 @@
+ALTER TABLE `assessment_template_plan`   
+  CHANGE `type` `type` VARCHAR(30) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0'  NULL   COMMENT '选人方式(全部：all 随机：random 指定：appoint)',
+  ADD COLUMN `stduy_status` VARCHAR(50) NULL   COMMENT '就读方式(xjr_dictionary_item[stduy_status])' AFTER `base_semester_id`;
+
+ALTER TABLE `assessment_template_plan`   
+  ADD COLUMN is_need_confirm INT DEFAULT 0 COMMENT '是否需要班主任确认(0:否 1:是)';