Browse Source

导入行政直播年级下无教师时提示

tags/正式版本
王宁 2 years ago
parent
commit
0c1a9b41d7

+ 2
- 0
slive/src/main/java/com/xhkjedu/slive/service/xz/XzService.java View File

@@ -729,6 +729,8 @@ public class XzService {
729 729
             List<XzClassVo> classlst = classMapper.listClassByXzid(schoolid, gradeid);
730 730
             String classids = classlst.stream().map((XzClassVo::getClassid)).map(String::valueOf).collect(Collectors.joining(","));
731 731
             List<CTeacherVo> teachers = classTeacherMapper.listTeacherByClassIds(classids);//获取班级教师
732
+            if(!N_Utils.isListNotEmpty(teachers)) return new ResultVo(1,"请设置班级任教老师");
733
+
732 734
             String teacherids = teachers.stream().map((CTeacherVo::getTeacherid)).map(String::valueOf).collect(Collectors.joining(","));
733 735
             List<CTeacherVo> subjects = classTeacherMapper.listSubjectByTeacherIds(teacherids);//获取教师科目
734 736
             String subjectids = subjects.stream().map(CTeacherVo::getSubjectid).distinct().collect(Collectors.joining("','"));

+ 1
- 1
slive/src/main/resources/application.properties View File

@@ -58,7 +58,7 @@ redisdatatime=604800
58 58
 secretKey=nanhuakaizhangjianwangni
59 59
 
60 60
 rabbitmq.queue=xhkjedutest.xhschool.livequeue_dev
61
-spring.rabbitmq.host=116.63.199.166
61
+spring.rabbitmq.host=49.4.26.249
62 62
 spring.rabbitmq.port=5672
63 63
 spring.rabbitmq.username=xhkjedu
64 64
 spring.rabbitmq.password=xhkjedud07

+ 1
- 0
suser/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml View File

@@ -57,6 +57,7 @@
57 57
     <select id="getClassIdByStuId" resultType="java.lang.Integer">
58 58
         select c.classid
59 59
         from t_class_student cs left join t_class c on cs.classid=c.classid
60
+        left join t_school s on c.schoolid=s.schoolid and c.year=s.year
60 61
         where cs.studentid=#{studentid} and c.classtype=1 and c.classstate=1 order by c.classid desc limit 1
61 62
     </select>
62 63
     <!--根据班级id和学生id获取班级学生信息-->

Loading…
Cancel
Save