From 44201f7edaf95afa21daeb43c4c88d22f670e8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 8 May 2023 11:37:48 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/FengHuang/Exam/Model/ExamModel.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
index 038df06..067b5a9 100644
--- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
@@ -125,7 +125,7 @@ public class ExamModel {
      */
     public void jiaoJuan(String person_id) {
         String sql = "update t_exam_person set end_time=? where person_id=?";
-        Db.update(sql,  DateTime.now(),person_id);
+        Db.update(sql, DateTime.now(), person_id);
     }
 
     /**
@@ -261,7 +261,10 @@ public class ExamModel {
         res.set("second", second);
         String ys = "";
         if (hour > 0) ys += hour + "小时";
-        ys += minute + "分钟";
+
+        if (hour == 0 && minute > 0) ys += minute + "分钟";
+        if (hour > 0) ys += minute + "分钟";
+
         if (second > 0) ys += second + "秒";
         res.set("ys", ys);
         return res;