shuzhan 2 rokov pred
rodič
commit
d42692f6e7

+ 2 - 1
web/src/main/java/com/jpsoft/education/modules/mobile/controller/TeacherApiController.java

@@ -112,7 +112,7 @@ public class TeacherApiController {
                 Tclass tclass = tclassService.get(ss.getClassId());
                 Tclass tclass = tclassService.get(ss.getClassId());
                 ss.setClassName(tclass.getClassName());
                 ss.setClassName(tclass.getClassName());
 
 
-                ClassRoom classRoom = classRoomService.get(ss.getClassroom());
+                ClassRoom classRoom = classRoomService.get(tclass.getClassroom());
                 ss.setClassroomN(classRoom.getName());
                 ss.setClassroomN(classRoom.getName());
 
 
                 List<BuyLog> buyLogList = buyLogService.findByStatusAndClassId("1",ss.getClassId());
                 List<BuyLog> buyLogList = buyLogService.findByStatusAndClassId("1",ss.getClassId());
@@ -177,6 +177,7 @@ public class TeacherApiController {
 
 
             ClassRoom classRoom = classRoomService.get(tclass.getClassroom());
             ClassRoom classRoom = classRoomService.get(tclass.getClassroom());
 
 
+
             List<Student> studentList = studentService.findByStatusAndClassId("1",scheduleSheet.getClassId());
             List<Student> studentList = studentService.findByStatusAndClassId("1",scheduleSheet.getClassId());
             for(Student student : studentList){
             for(Student student : studentList){
                 RollcallLog rollcallLog = rollcallLogService.findByStudentIdAndSheetId(student.getStudentId(),scheduleSheet.getSheetId());
                 RollcallLog rollcallLog = rollcallLogService.findByStudentIdAndSheetId(student.getStudentId(),scheduleSheet.getSheetId());