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" and worker_certification.status = #{status} and worker.dept_id = #{deptId} + order by worker_certification.create_time desc