学生成绩录入

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -266,10 +266,19 @@ public class JianyuekbScheduleTask {
         tableName = "base_classroom";
         Map<String, String> classroomMap = dataMap.get(tableName);
 
-        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap, courseReceiveMsgId);
+        Set<String> techerIds = dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap, courseReceiveMsgId);
+        sendMsg(techerIds);
         dataUtil.insertClassTime(scheduleInfo);
     }
 
+    void sendMsg(Set<String> techerIds){
+        //通知对应教师
+        List<User> userList = userService.listByIds(new ArrayList<>(techerIds));
+        for (User user : userList) {
+            
+        }
+    }
+
     Map<String, Map<String, String>> initDataMap(){
         Map<String, Map<String, String>> dataMap = new HashMap<>();
         String sql = "SELECT distinct table_name FROM jianyue_data WHERE 1 = 1";

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -618,7 +618,7 @@ public class DataUtil {
         }
     }
 
-    public void insertCourseTableEntiy(JsonArray data, Map<String, String> classroomMap, Map<String, String> coureseMap,
+    public Set<String> insertCourseTableEntiy(JsonArray data, Map<String, String> classroomMap, Map<String, String> coureseMap,
                                   Map<String, String> semesterMap, Map<String, String> teacherMap, Map<String, String> classMap
             , Long courseReceiveMsgId) {
 
@@ -641,7 +641,7 @@ public class DataUtil {
             }
             serialNos.add(objectMap.get("jianyue_id").toString());
         }
-
+        Set<String> teacherIdList = new HashSet<>();
         for (JsonElement jsonElement : data) {
             JsonObject asJsonObject = jsonElement.getAsJsonObject();
             JsonArray teachers = asJsonObject.get("teachers").getAsJsonArray();
@@ -665,6 +665,7 @@ public class DataUtil {
                 teacherIds.add(teacherMap.get(teacherJson.get("teacherSerialNo").getAsString())==null?"0":teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()));
                 teacherNames.add(teacherJson.get("name").getAsString());
                 teacher_serial_nos.add(teacherJson.get("teacherSerialNo").getAsString());
+                teacherIdList.add(teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()));
             }
             String teacherId = "0";
             if(!teacherIds.isEmpty()){
@@ -713,6 +714,8 @@ public class DataUtil {
                 SqlRunnerAdapter.db().update(updateSql);
             }
         }
+
+        return teacherIdList;
     }
 
     /**

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamPlanController.java

@@ -144,7 +144,7 @@ public class ExamPlanController {
     public RT<List<ExamPlanListVo>> allPlan(@Valid ExamPlanPageDto dto){
         List<ExamPlan> list = examPlanService.list(
                 new QueryWrapper<ExamPlan>().lambda()
-                        .eq(ExamPlan::getSemesterId, dto.getSemesterId())
+                        .eq(dto.getSemesterId() !=null, ExamPlan::getSemesterId, dto.getSemesterId())
                         .eq(ExamPlan::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
         List<ExamPlanListVo> listVos = BeanUtil.copyToList(list, ExamPlanListVo.class);