优化管理员操作

2c2c2c
1 parent dac0b583
Showing 2 changed files with 9 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -331,14 +331,17 @@ public class KeyBoxController extends BaseController {
         // 转换并处理领取钥匙的位置信息
         List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1, venueInfo);
  
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>");
-        //如果是管理员操作改变排班表的exType=3
+        //如果是管理员操作改变排班表的exType=3，管理员代领
         if (dto.getOpeType()==16) {
             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.ge(LinggangScheduling::getScheduleDate, DateUtils.dateTime("yyyy-MM-dd",date))))
+            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");
+            //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)
+            // LIMIT 1
             List<LinggangScheduling> scheduling = schedulingService.list(wrapper);
             if(!scheduling.isEmpty()){
                 scheduling.get(0).setExType(4);
@@ -86,9 +86,11 @@
         </where>
  
  
+
+
     </select>
     <select id="queryByMonth" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
-        select scheduling.*, driver.fleet_name fleetName,equipment.name siteName
+        select scheduling.*, driver.fleet_name fleetName,equi pment.name siteName
         from scheduling
                  left join driver on driver.job_code = scheduling.job_code
                  left join sign_in on scheduling.sign_in_id = sign_in.id