From 3271cf06f3cd4b6cf01efe3bfb0038546a01a419 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 29 Jan 2024 17:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=80=92=E5=BA=8F+40?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E8=87=AA=E5=8A=A8=E6=8B=92=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java    | 4 ++--
 .../resources/mapper/worker/WorkerCertificationMapper.xml     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 3d9a21d4..50021bdd 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -93,9 +93,9 @@ public class OrderServiceImpl implements OrderService {
             Date overTime1h = getOverTime(createTime, 30 * 60 * 1000);
             boolean flag;
             if(order.getUpdateTime() != null){
-                flag = getOverTime(order.getUpdateTime(), 30 * 60 * 1000).before(now);
+                flag = getOverTime(order.getUpdateTime(), 40 * 60 * 1000).before(now);
             }else {
-                flag = getOverTime(createTime, 30 * 60 * 1000).before(now);
+                flag = getOverTime(createTime, 40 * 60 * 1000).before(now);
             }
             // 是否已经超时
             boolean timeout = ONE.equals(order.getTimeout());
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
index 951dbae7..9f794912 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and worker_certification.status = #{status}</if>
             <if test="deptId != null and deptId != ''"> and worker.dept_id = #{deptId}</if>
         </where>
+        order by worker_certification.create_time desc
     </select>
 
     <select id="selectWorkerCertificationByWorkerCertificationId" parameterType="String" resultMap="WorkerCertificationResult">