fix: 修复没有备注bug和修复驾驶员查询条件不生效bug

guzijian
1 parent 695549eb
Showing 3 changed files with 5 additions and 1 deletions
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -198,6 +198,7 @@ public class DriverJob implements InitializingBean {
     }
  
     // 弃用  无用方法
+    @Deprecated
     public void clearExceptionYesterdayRecord() {
         // 获取当前日期时间
         Calendar calendar = Calendar.getInstance();
@@ -148,6 +148,9 @@ public class SchedulingService {
             } else {
                 sb.append("迟到");
             }
+            // 在规定时间就还原remark
+        }else {
+            sb.append(signIn.getRemark());
         }
         if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
             sb.append("," + signIn.getRemark().substring(signIn.getRemark().indexOf(ALCOHOL_SIGN_IN_ERROR)));
@@ -111,7 +111,7 @@
             <if test="tagRfid != null  and tagRfid != ''">and driver.tag_rfid = #{tagRfid}</if>
             <if test="lineName != null  and lineName != ''">and driver.line_name like concat('%', #{lineName}, '%')</if>
             <if test="lineCode != null  and lineCode != ''">and driver.line_code = #{lineCode}</if>
-            <if test="faceSignIn != null  and faceSignIn != ''">and driver.face_sign_in = #{faceSignIn}</if>
+            <if test="faceSignIn != null ">and driver.face_sign_in = #{faceSignIn}</if>
             <if test="fleetName != null  and fleet_name != ''">and driver.fleet_name = #{fleetName}</if>
         </where>
     </select>