结构性试题数量统计优化

sapi/src/main/resources/mapper/analyze/SchoolResourceMapper.xml

@@ -128,9 +128,9 @@
     </select>
     <!--结构性试题数量统计-->
     <select id="getSchoolQuestionNum" resultType="com.xhkjedu.sapi.vo.analyze.SchoolQuestionVo">
-        SELECT COUNT(DISTINCT q.questionid) AS questionnum,COUNT(qc.qcid)collectnum
-        ,(SELECT COUNT(*) FROM t_paper p WHERE p.papertype=1 AND p.schoolid=#{params.schoolid})papernum
-        FROM t_question q left join t_question_collect qc on q.questionid=qc.questionid
+        SELECT COUNT(DISTINCT q.questionid) AS questionnum
+        ,(SELECT COUNT(*) FROM t_paper p WHERE p.papertype in(1,3) and p.paperstate=22 AND p.schoolid=#{params.schoolid})papernum
+        FROM t_question q
         left join t_subject s on q.subjectid=s.subjectid
         left join t_school ts on s.level=ts.schoollevel
         WHERE q.qstate=1 AND (q.belong IN(1,2) OR (q.belong=3 AND q.schoolid=#{params.schoolid})) and ts.schoolid=#{params.schoolid}