From f1448b60dadb3421ce40148d4a74cef0c804d909 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 21 May 2025 16:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=80=83=E8=AF=95=E6=8C=890=E5=88=86?=
 =?UTF-8?q?=E7=AE=97=EF=BC=8C=E6=88=90=E7=BB=A9=E4=B8=BA=E4=B8=8D=E5=8F=8A?=
 =?UTF-8?q?=E6=A0=BC=E4=BB=A5=E5=8F=8A=E5=B1=95=E7=A4=BA=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/exam/vo/QuestionsExamVo.java |  5 +++
 .../resources/mapper/exam/ExamTaskMapper.xml  | 32 +++++++++----------
 .../mapper/exam/TestQuestLibraryMapper.xml    |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java
index be8007d..86393c6 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java
@@ -51,6 +51,11 @@ public class QuestionsExamVo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTimeDate;
     /**
      * 修改时间
      */
diff --git a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml
index 99dbba5..d95e40f 100644
--- a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml
+++ b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml
@@ -162,22 +162,22 @@
     <!--学员数据列表-->
     <select id="getTaskUsers" resultType="com.bonus.common.exam.vo.StudyTaskPersonVo">
         SELECT su.nick_name AS name,
-               etu.user_id AS userId,
-               etu.sex AS sex,
-               if(etu.sex = '0', '男', '女') AS sexName,
-               ppi.pro_name AS proName,
-               pci.cont_name AS subName,
-               su.phonenumber AS phone,
-               su.id_card AS idCard,
-               etu.post_name AS postName,
-               sp.post_name AS typeOfWork,
-               etu.user_uuid AS userUuid,
-               estp.exam_paper_id AS examPaperId,
-               eepr.score AS score,
-               CASE WHEN eepr.score IS NULL THEN ''
-                   WHEN eepr.score &gt;= eep.pass_score THEN '1'
-                   ELSE '0'
-               END AS isPass
+        etu.user_id AS userId,
+        etu.sex AS sex,
+        if(etu.sex = '0', '男', '女') AS sexName,
+        ppi.pro_name AS proName,
+        pci.cont_name AS subName,
+        su.phonenumber AS phone,
+        su.id_card AS idCard,
+        etu.post_name AS postName,
+        sp.post_name AS typeOfWork,
+        etu.user_uuid AS userUuid,
+        estp.exam_paper_id AS examPaperId,
+        ifnull(eepr.score,0) AS score,
+        CASE
+        WHEN ifnull(eepr.score,0) &gt;= eep.pass_score THEN '1'
+        ELSE '0'
+        END AS isPass
         FROM ek_task_user etu
         LEFT JOIN ek_study_task_paper estp ON etu.task_id = estp.study_task_id AND estp.task_type = '3'
         LEFT JOIN edu_exam_paper eep ON estp.exam_paper_id = eep.exam_paper_id
diff --git a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/TestQuestLibraryMapper.xml b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/TestQuestLibraryMapper.xml
index 3ca65c0..cb2bba7 100644
--- a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/TestQuestLibraryMapper.xml
+++ b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/TestQuestLibraryMapper.xml
@@ -196,7 +196,7 @@
                eqe.content AS content,
                eqe.correct_answer AS correctAnswer,
                eqe.analysis AS analysis,
-               eqe.create_time AS createTime,
+               eqe.create_time AS createTimeDate,
                eqe.question_type AS questionType,
                eqe.create_user_name AS createUserName,
                a.questionLabel