|
|
@@ -101,7 +101,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectClassesBuildStatsDetail" resultType="com.alibaba.fastjson2.JSONObject">
|
|
|
- SELECT
|
|
|
+ SELECT distinct
|
|
|
u.`nick_name` AS studentName,
|
|
|
CONCAT(u.`nick_name`, '-', IFNULL(u.`phonenumber`, '')) AS namePhone,
|
|
|
IFNULL(card.`card_no`, '') AS cardNo,
|
|
|
@@ -141,8 +141,8 @@
|
|
|
<choose>
|
|
|
<!-- send: 组卷已完成 -->
|
|
|
<when test="statType == 'send'">
|
|
|
- AND ls.`major_plan_id` IS NOT NULL
|
|
|
- AND ts.`student_id` IS NOT NULL
|
|
|
+ AND ls.`major_plan_id` IS NOT NULL
|
|
|
+ AND ts.`student_id` IS NOT NULL
|
|
|
AND ts.`status` = 4
|
|
|
</when>
|
|
|
<!-- total: 班级人数 -->
|
|
|
@@ -155,13 +155,13 @@
|
|
|
</when>
|
|
|
<!-- unfinish: 组卷未完成 -->
|
|
|
<when test="statType == 'unfinish'">
|
|
|
- AND ls.`major_plan_id` IS NOT NULL
|
|
|
- AND ts.`student_id` IS NOT NULL
|
|
|
+ AND ls.`major_plan_id` IS NOT NULL
|
|
|
+ AND ts.`student_id` IS NOT NULL
|
|
|
AND ts.`status` != 4
|
|
|
</when>
|
|
|
<!-- unsend: 定向未组卷 -->
|
|
|
<when test="statType == 'unsend'">
|
|
|
- AND ls.`major_plan_id` IS NOT NULL
|
|
|
+ AND ls.`major_plan_id` IS NOT NULL
|
|
|
AND ts.`student_id` IS NULL
|
|
|
</when>
|
|
|
</choose>
|
|
|
@@ -215,7 +215,7 @@
|
|
|
|
|
|
<select id="selectDzClassesBySchoolIds" resultMap="DzClassesResult">
|
|
|
<include refid="selectDzClassesVo"/>
|
|
|
- where t1.school_id in
|
|
|
+ where t1.school_id in
|
|
|
<foreach collection="schoolIds" item="schoolId" open="(" separator="," close=")">
|
|
|
#{schoolId}
|
|
|
</foreach>
|