guzijian / bsth-alcohol-sign · Commits

Commit 088d8a894b4a4f8cf5bf33b0b8c5e385292c17ad

Authored by guzijian
1 parent 77b03603

fix: 添加测试人员

Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @088d8a8
@@ -337,7 +337,7 @@ public class DriverServiceImpl implements IDriverService { @@ -337,7 +337,7 @@ public class DriverServiceImpl implements IDriverService {
337 dto = schedulingService.queryScheduling(item.getJobCode(), now); 337 dto = schedulingService.queryScheduling(item.getJobCode(), now);
338 DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag); 338 DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
339 if (CollectionUtil.isEmpty(dto) && (item.getJobCode().equals("722717") || item.getJobCode().equals("700001"))) { 339 if (CollectionUtil.isEmpty(dto) && (item.getJobCode().equals("722717") || item.getJobCode().equals("700001"))) {
340 - vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, true, true, "测试", "测试", "测试")); 340 + vos.add(DriverResponseVo.createDriverResponseVo(null, item, "签到", true, true, "测试", "测试", "测试"));
341 }else { 341 }else {
342 // 无排班 342 // 无排班
343 if (Objects.isNull(vo)) { 343 if (Objects.isNull(vo)) {
ruoyi-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
  View file @088d8a8
@@ -128,6 +128,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper, @@ -128,6 +128,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper,
128 } 128 }
129 // 存在分段 129 // 存在分段
130 else { 130 else {
  131 + main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
131 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime()))); 132 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
132 if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) { 133 if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) {
133 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime())); 134 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));