教材申领bug修复

src/main/resources/mapper/student/StudentReportRecordMapper.xml

@@ -25,10 +25,10 @@
         AND a1.gender = 'SB10002' AND a2.class_id = t1.id
         ) AS female_count,
         (
-        SELECT COUNT(*) FROM xjr_user a1
+        SELECT COUNT(distinct(a1.id)) FROM xjr_user a1
         INNER JOIN base_student_school_roll a2 ON a1.id = a2.user_id
         INNER JOIN student_report_record a3 ON a1.id = a3.user_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 and a3.delete_mark = 0
         AND a2.class_id = t1.id AND a3.base_semester_id = #{dto.baseSemesterId} AND a3.report_time IS NOT NULL
         ) AS arrived_count
         FROM base_class t1

src/main/resources/mapper/textbook/TextbookStudentClaimMapper.xml

@@ -18,9 +18,7 @@
         WHERE t.delete_mark = 0
         AND (t.student_user_id = #{dto.studentUserId})
         AND (t2.base_semester_id = #{dto.baseSemesterId})
-        <if test="dto.showOrConfirm != null and dto.showOrConfirm == 2">
             and t.is_claim = 0
-        </if>
         ORDER BY t.id DESC
     </select>