|
|
@@ -31,11 +31,12 @@
|
|
|
(SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND gender = 'SB10002') AS female_count,
|
|
|
(SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND stduy_status = 'FB3001') AS not_stay_count,
|
|
|
(SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND stduy_status = 'FB3002') AS stay_count,
|
|
|
- t1.height, t1.weight,t3.name as teacher_name FROM banding_task_class t1
|
|
|
+ t5.height, t5.score,t3.name AS teacher_name FROM banding_task_class t1
|
|
|
LEFT JOIN base_major_set t2 ON t1.major_set_id = t2.id
|
|
|
LEFT JOIN xjr_user t3 ON t1.teacher_id = t3.id
|
|
|
LEFT JOIN base_classroom t4 ON t1.classroom_id = t4.id
|
|
|
- WHERE t1.delete_mark = 0 and t1.banding_task_id = #{dto.bandingTaskId}
|
|
|
+ LEFT JOIN banding_task_major_condition t5 ON t5.major_set_id = t1.major_set_id AND t5.banding_task_id = t1.banding_task_id
|
|
|
+ WHERE t1.delete_mark = 0 AND t1.banding_task_id = #{dto.bandingTaskId}
|
|
|
</select>
|
|
|
|
|
|
<select id="getClassStudent" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto" resultType="com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo">
|
|
|
@@ -81,4 +82,8 @@
|
|
|
<select id="getMajorClassStudentCount" resultType="com.xjrsoft.module.outint.vo.IdCountVo">
|
|
|
SELECT major_set_id,sum(number) FROM banding_task_class WHERE banding_task_id = #{id} AND delete_mark = 0 GROUP BY major_set_id
|
|
|
</select>
|
|
|
+
|
|
|
+ <select id="getMajorClassStudentCount" resultType="com.xjrsoft.module.banding.entity.BandingTaskClass">
|
|
|
+ SELECT * FROM banding_task_class WHERE delete_mark = 0 and banding_task_id = #{id} ORDER BY IF(ISNULL(sort_code),1,0) ASC
|
|
|
+ </select>
|
|
|
</mapper>
|