|
|
@@ -17,24 +17,24 @@
|
|
17
|
17
|
where g.groupid=#{groupid}
|
|
18
|
18
|
</update>
|
|
19
|
19
|
<resultMap id="teacherGroup" type="com.xhkjedu.suser.vo.gradeclass.ClassGroupVo">
|
|
20
|
|
- <result property="classid" column="classid"></result>
|
|
21
|
|
- <result property="classname" column="classname"></result>
|
|
22
|
|
- <result property="gradeid" column="gradeid"></result>
|
|
23
|
|
- <result property="classnum" column="classnum"></result>
|
|
|
20
|
+ <result property="classid" column="classid"/>
|
|
|
21
|
+ <result property="classname" column="classname"/>
|
|
|
22
|
+ <result property="gradeid" column="gradeid"/>
|
|
|
23
|
+ <result property="classnum" column="classnum"/>
|
|
24
|
24
|
<collection property="groups" ofType="com.xhkjedu.suser.vo.gradeclass.GroupVo">
|
|
25
|
|
- <result property="classid" column="classid"></result>
|
|
26
|
|
- <result property="groupid" column="groupid"></result>
|
|
27
|
|
- <result property="groupname" column="groupname"></result>
|
|
28
|
|
- <result property="grouptype" column="grouptype"></result>
|
|
29
|
|
- <result property="groupnum" column="groupnum"></result>
|
|
|
25
|
+ <result property="classid" column="classid"/>
|
|
|
26
|
+ <result property="groupid" column="groupid"/>
|
|
|
27
|
+ <result property="groupname" column="groupname"/>
|
|
|
28
|
+ <result property="grouptype" column="grouptype"/>
|
|
|
29
|
+ <result property="groupnum" column="groupnum"/>
|
|
30
|
30
|
<!--<collection property="students" ofType="com.xhkjedu.suser.vo.gradeclass.CStudentVo"
|
|
31
|
31
|
javaType="java.util.List" select="listStudent" column="{groupid=groupid}">
|
|
32
|
32
|
</collection>-->
|
|
33
|
33
|
</collection>
|
|
34
|
34
|
</resultMap>
|
|
35
|
35
|
<resultMap id="studentResult" type="com.xhkjedu.suser.vo.gradeclass.CStudentVo">
|
|
36
|
|
- <result property="studentid" column="studentid"></result>
|
|
37
|
|
- <result property="studentname" column="studentname"></result>
|
|
|
36
|
+ <result property="studentid" column="studentid"/>
|
|
|
37
|
+ <result property="studentname" column="studentname"/>
|
|
38
|
38
|
</resultMap>
|
|
39
|
39
|
<select id="listStudent" resultMap="studentResult">
|
|
40
|
40
|
select gs.studentid,u.username studentname,u.headpic
|
|
|
@@ -53,20 +53,20 @@
|
|
53
|
53
|
</select>
|
|
54
|
54
|
<!--伙伴学校班级分组列表-->
|
|
55
|
55
|
<resultMap id="teacherGroup2" type="java.util.Map">
|
|
56
|
|
- <result property="schoolid" column="schoolid"></result>
|
|
57
|
|
- <result property="schoolname" column="schoolname"></result>
|
|
|
56
|
+ <result property="schoolid" column="schoolid"/>
|
|
|
57
|
+ <result property="schoolname" column="schoolname"/>
|
|
58
|
58
|
<collection property="classes" ofType="java.util.Map" javaType="java.util.List">
|
|
59
|
|
- <result property="schoolid" column="schoolid"></result>
|
|
60
|
|
- <result property="classid" column="classid"></result>
|
|
61
|
|
- <result property="classname" column="classname"></result>
|
|
62
|
|
- <result property="gradeid" column="gradeid"></result>
|
|
63
|
|
- <result property="classtype" column="classtype"></result>
|
|
|
59
|
+ <result property="schoolid" column="schoolid"/>
|
|
|
60
|
+ <result property="classid" column="classid"/>
|
|
|
61
|
+ <result property="classname" column="classname"/>
|
|
|
62
|
+ <result property="gradeid" column="gradeid"/>
|
|
|
63
|
+ <result property="classtype" column="classtype"/>
|
|
64
|
64
|
<collection property="groups" ofType="com.xhkjedu.suser.vo.gradeclass.GroupVo" javaType="java.util.List">
|
|
65
|
|
- <result property="classid" column="classid"></result>
|
|
66
|
|
- <result property="groupid" column="groupid"></result>
|
|
67
|
|
- <result property="groupname" column="groupname"></result>
|
|
68
|
|
- <result property="grouptype" column="grouptype"></result>
|
|
69
|
|
- <result property="groupnum" column="groupnum"></result>
|
|
|
65
|
+ <result property="classid" column="classid"/>
|
|
|
66
|
+ <result property="groupid" column="groupid"/>
|
|
|
67
|
+ <result property="groupname" column="groupname"/>
|
|
|
68
|
+ <result property="grouptype" column="grouptype"/>
|
|
|
69
|
+ <result property="groupnum" column="groupnum"/>
|
|
70
|
70
|
</collection>
|
|
71
|
71
|
</collection>
|
|
72
|
72
|
</resultMap>
|
|
|
@@ -75,11 +75,10 @@
|
|
75
|
75
|
,c.classid,c.classname,c.classnum,c.gradeid,c.classtype
|
|
76
|
76
|
,g.groupid,g.groupname,g.grouptype,g.groupnum
|
|
77
|
77
|
from t_school_friend sf left join t_school s on sf.fschoolid = s.schoolid
|
|
78
|
|
- left join t_teacher_powersb tp on s.schoolid = tp.schoolid
|
|
79
|
|
- left join t_class_teacher ct on tp.teacherid = ct.teacherid
|
|
|
78
|
+ left join t_class_teacher ct on s.schoolid = ct.schoolid
|
|
80
|
79
|
left join t_class c on ct.classid = c.classid
|
|
81
|
80
|
left join t_group g on c.classid = g.classid
|
|
82
|
|
- where sf.schoolid=#{schoolid} and tp.subjectid=#{subjectid}
|
|
|
81
|
+ where sf.schoolid=#{schoolid}
|
|
83
|
82
|
and (g.grouptype=1 or g.createid=ct.teacherid)
|
|
84
|
83
|
and c.gradeid=(select c2.gradeid from t_class c2 left join t_class_teacher ct2 on c2.classid=ct2.classid
|
|
85
|
84
|
where c2.schoolid=#{schoolid} and c2.year=s.year and c2.classtype in(1,2) and ct2.teacherid=#{teacherid} limit 1)
|
