From 3542dc2e46f6d06ea201d2706a699f7536ea7dbe Mon Sep 17 00:00:00 2001
From: = <=>
Date: Tue, 23 Jun 2026 17:39:59 +0800
Subject: [PATCH] commit

---
 .../qsv/service/impl/QsvQuizRankServiceImpl.java      | 11 +++++++----
 .../platform/zhgh/dayofficework/qsv/quiz/rank.html    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvQuizRankServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvQuizRankServiceImpl.java
index 7102663..f8ee590 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvQuizRankServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvQuizRankServiceImpl.java
@@ -70,12 +70,12 @@ public class QsvQuizRankServiceImpl extends BaseServiceImpl<QsvUserAnswerRecord>
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
         exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
         exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
+        exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 30));
+        exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
         exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
-        exportEntities.add(new ExcelExportEntity("单位", "unitName", 30));
-        exportEntities.add(new ExcelExportEntity("分工会", "unionName", 30));
         exportEntities.add(new ExcelExportEntity("联系方式", "mobile", 30));
         if ("SCHEDULED".equals(mode) && pageForm.getAttemptDate() != null) {
-            exportEntities.add(new ExcelExportEntity("答题日期", "attemptDate", 20));
+            exportEntities.add(new ExcelExportEntity("答题时间", "submitTime", 20));
             exportEntities.add(new ExcelExportEntity("当天得分", "totalScore", 20));
         } else {
             exportEntities.add(new ExcelExportEntity("得分", "sumScore", 20));
@@ -100,6 +100,7 @@ public class QsvQuizRankServiceImpl extends BaseServiceImpl<QsvUserAnswerRecord>
                         u.mobile,
                         t1.totalScore,
                         t1.attemptDate,
+                        t1.submitTime,
                         sum(t1.totalScore) as sumScore
                     FROM
                         `qsv_user_answer_record` t1
@@ -133,7 +134,9 @@ public class QsvQuizRankServiceImpl extends BaseServiceImpl<QsvUserAnswerRecord>
         }
 
         cnd.groupBy("t1.userId");
-        cnd.desc("t1.totalScore");
+        cnd.asc("t1.unionName");
+        cnd.asc("t1.unitName");
+        cnd.asc("t1.loginName");
 
         Sql sql = Sqls.create(sqlBuilder.toString());
         sql.setCondition(cnd);
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html b/src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html
index d432e06..f1cce25 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/quiz/rank.html
@@ -67,7 +67,7 @@ layout("/layouts/platform.html"){
                 <el-table-column label="所属工会" prop="unionName" sortable></el-table-column>
                 <el-table-column label="所属单位" prop="unitName" sortable></el-table-column>
                 <el-table-column label="联系方式" prop="mobile" sortable></el-table-column>
-                <el-table-column label="答题日期" prop="attemptDate" sortable></el-table-column>
+                <el-table-column label="答题时间" prop="submitTime" sortable></el-table-column>
                 <el-table-column label="得分" prop="totalScore" sortable></el-table-column>
                 <el-table-column label="操作" fixed="right" width="100px" v-if="$auth.hasPermission('qsv.quiz.rank.delete')">
                     <template slot-scope="{row}">