Merge remote-tracking branch 'origin/main'

ccic-exam/src/main/java/com/ccic/safeliab/web/ExamStatisticsController.java

@@ -80,7 +80,8 @@ public class ExamStatisticsController {
     public R getExamPaperAnalysisPageList(
                                           @RequestParam String paperName,
                                           @RequestParam String industry) {
-        return R.ok().data(service.getExamPaperAnalysisPageList(paperName,industry));
+        List<Map<String,Object>> result =service.getExamPaperAnalysisPageList(paperName,industry);
+        return R.ok().data(result);
     }
     @GetMapping("/getPaperName")
     public R getPaperName(

ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml

@@ -211,7 +211,7 @@
     </select>
     <select id="getExamDetailAnalysisPageList" resultType="java.util.Map">
         SELECT
-            scores.exam_id as examId,
+            scores.exam_id :: text as examId,
             info.exam_name as examName,
             papers.paper_name as paperName,
             CASE
@@ -232,10 +232,10 @@
                 LEFT JOIN ex_exam_info AS info ON info.ID = scores.exam_id
                 AND info.paper_id = scores.paper_id
                 AND info.is_deleted = 0
-                AND info.publish_status = 1
+--                 AND info.publish_status = 1
                 LEFT JOIN ex_exam_papers papers ON papers.ID = scores.paper_id
                 AND papers.is_deleted = 0
-                AND papers.paper_status = 1
+--                 AND papers.paper_status = 1
                 LEFT JOIN tbl_industry ind ON ind.industry_id = info.industry_id
                 AND ind.status = 1
         WHERE
@@ -348,7 +348,7 @@
     </select>
     <select id="getExamPaperAnalysisPageList" resultType="java.util.Map">
         SELECT
-            paper.id as paperId,
+            paper.id ::text as paperId ,
             paper.paper_name as paperName,
             ind.industry_name as industry,
             count(info.id) as useCount,
@@ -443,5 +443,6 @@
             cate.answer,
             cate.options,
             question.question_number
+        order by question.question_number
     </select>
 </mapper>