guzijian / bsth-alcohol-sign · Commits

Commit a2f2b911cd521dc102ea4edfd6ea5e0c3d891327

Authored by liujun001
1 parent 88c1f714
build: skipped

优化签到

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
  View file @a2f2b91
@@ -398,7 +398,7 @@ public class SignInServiceV1Impl extends ServiceImpl<SignInMapperV1, SignInV1> i @@ -398,7 +398,7 @@ public class SignInServiceV1Impl extends ServiceImpl<SignInMapperV1, SignInV1> i
398 signIn.setRemark(remark); 398 signIn.setRemark(remark);
399 signIn.setExType(2); 399 signIn.setExType(2);
400 signIn.setStatus(2); 400 signIn.setStatus(2);
401 - signIn.setType(1); 401 +// signIn.setType(1);
402 402
403 } 403 }
404 404
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
  View file @a2f2b91
@@ -29,9 +29,11 @@ public class SchedulingServiceV1Impl extends ServiceImpl<SchedulingMapperV1, Dri @@ -29,9 +29,11 @@ public class SchedulingServiceV1Impl extends ServiceImpl<SchedulingMapperV1, Dri
29 dateStr = StringUtils.join(dateStr, " 00:00:00"); 29 dateStr = StringUtils.join(dateStr, " 00:00:00");
30 Date date2 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr); 30 Date date2 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
31 31
  32 + Date date3 = org.apache.commons.lang3.time.DateUtils.addMinutes(date, -80);
  33 +
32 wrapper.eq(DriverSchedulingV1::getJobCode, jobCode); 34 wrapper.eq(DriverSchedulingV1::getJobCode, jobCode);
33 wrapper.and(wr -> { 35 wrapper.and(wr -> {
34 - wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, date2.getTime(), date1.getTime()); 36 + wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, date3.getTime(), date1.getTime()).or();
35 }); 37 });
36 wrapper.orderByAsc(DriverSchedulingV1::getFcsjT); 38 wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
37 } catch (ParseException e) { 39 } catch (ParseException e) {