优化管理员代领钥匙逻辑

2c
1 parent e4b45c2e
Showing 1 changed file with 4 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
@@ -336,11 +336,12 @@ public class KeyBoxController extends BaseController {
             String date = DateFormatUtils.format(DateUtils.getNowDate(),"yyyy-MM-dd");
             LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(LinggangScheduling::getNbbm,dto.getKeyItem().get(0).getPlate()).and(i -> i.and(j -> j.apply("DATE_FORMAT(schedule_date, '%Y-%m-%d') LIKE {0}", date+"%")))
-                    .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员")).last("ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 1000)")
-                    .last("limit 1");
+                    .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员"))
+                    .last("ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 1000) LIMIT 1");
             //sql 语句：
             // SELECT * FROM `linggang_scheduling`
-            // WHERE nbbm = 'A01' AND DATE_FORMAT(schedule_date, '%Y-%m-%d') LIKE '2023-07-08%' AND bc_type = 'out' AND posts = '驾驶员' ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 100)
+            // WHERE nbbm = 'A01' AND DATE_FORMAT(schedule_date, '%Y-%m-%d') LIKE '2023-07-08%' AND bc_type = 'out' AND posts = '驾驶员'
+            // ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 100)
             // LIMIT 1
             List<LinggangScheduling> scheduling = schedulingService.list(wrapper);
             if(!scheduling.isEmpty()){