Przeglądaj źródła

老师考勤统计bug修复

dzx 7 miesięcy temu
rodzic
commit
1c311c4342

+ 6 - 3
src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -164,9 +164,12 @@ public class StatisticsController {
             attendanceTeacherList.addAll(teacherbaseManagerService.getList(teacherPageDto));
 
             teacherPageDto = new BaseTeacherPageDto();
-            List<Long> dtoDeptIds = new ArrayList<>();
-            dtoDeptIds.add(dto.getDeptId());
-            teacherPageDto.setDeptIds(dtoDeptIds);
+            if(dto.getDeptId() != null){
+                List<Long> dtoDeptIds = new ArrayList<>();
+                dtoDeptIds.add(dto.getDeptId());
+                teacherPageDto.setDeptIds(dtoDeptIds);
+            }
+
             List<XjrUserPageVo> allTeacherList = teacherbaseManagerService.getList(teacherPageDto);
 
             statisticsVo.setNotAttendanceCount(allTeacherList.size() - attendanceTeacherList.size());

+ 14 - 0
src/main/resources/sqlScript/20250427_sql.sql

@@ -131,6 +131,20 @@ CREATE TABLE `class_internship_dynamic_read`
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci COMMENT ='实习动态已读表';
 
+-- --------------------------------------------------------------------------------------------
+-- 班级动态表阅读表
+-- --------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS base_class_dynamics_relation;
+CREATE TABLE `base_class_dynamics_relation` (
+`id` BIGINT NOT NULL,
+`base_class_dynamics_id` BIGINT DEFAULT NULL COMMENT '动态id(base_class_dynamics)',
+`read_mark` INT DEFAULT NULL COMMENT '是否已阅读(0:否 1:是)',
+`read_date` DATETIME DEFAULT NULL COMMENT '阅读时间',
+`user_id` BIGINT DEFAULT NULL COMMENT '阅读用户',
+`reply_content` VARCHAR(250) DEFAULT NULL COMMENT '回复内容',
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='班级动态表阅读表';
+