From 1dd762805709429dbc4fcc8c719fe120b9ebf3b5 Mon Sep 17 00:00:00 2001
From: sunhonglei <sunhonglei@51dayu.com>
Date: Fri, 21 Mar 2025 14:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccic/safeliab/web/ExamStatisticsController.java   | 3 ++-
 ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamStatisticsController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamStatisticsController.java
index 95abb06..42289c4 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamStatisticsController.java
+++ b/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(
diff --git a/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml b/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
index 2e4e585..4ed0b9a 100644
--- a/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
+++ b/ccic-exam/src/main/resources/mappers/ExamStatisticsMapper.xml
@@ -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>
\ No newline at end of file