1、教师加班统计报错修复

2、数据看板课表数据统计调整

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -49,6 +49,8 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -144,15 +146,17 @@ public class DataboardController {
         );
         CourseStatisticsVo result = new CourseStatisticsVo();
         result.setAllCount(list.size());
-        int teacherCount = 0, noTeacherCount = 0;
+        Set<String> teacherCountSet = new HashSet<>();
+        int noTeacherCount = 0;
         for (CourseTable courseTable : list) {
             if(courseTable.getTeacherId() != null && !"0".equals(courseTable.getTeacherId())){
-                teacherCount ++;
+                String[] split = courseTable.getTeacherId().split(",");
+                teacherCountSet.addAll(Arrays.asList(split));
             }else{
                 noTeacherCount ++;
             }
         }
-        result.setTeacherCount(teacherCount);
+        result.setTeacherCount(teacherCountSet.size());
         result.setNoTeacherCount(noTeacherCount);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String sql = "SELECT t1.* FROM wf_course_adjust t1" +

src/main/java/com/xjrsoft/module/ledger/controller/LedgerStatisticsController.java

@@ -236,7 +236,7 @@ public class LedgerStatisticsController {
                 ")";
         }
         if(!userIdList.isEmpty()){
-            sql = " AND t.teacher_user_id in (" + userIdList.toString().replace("[", "").replace("]", "") + ")";
+            sql = " AND t4.teacher_user_id in (" + userIdList.toString().replace("[", "").replace("]", "") + ")";
         }
         sql += " GROUP BY t4.teacher_user_id";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
@@ -315,7 +315,7 @@ public class LedgerStatisticsController {
                     ")";
         }
         if(!userIdList.isEmpty()){
-            sql = " AND t.teacher_user_id in (" + userIdList.toString().replace("[", "").replace("]", "") + ")";
+            sql = " AND t4.teacher_user_id in (" + userIdList.toString().replace("[", "").replace("]", "") + ")";
         }
         sql += " GROUP BY t4.teacher_user_id";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);