guzijian / bsth-alcohol-sign · Commits

Commit 42dd74ca9e0f60fe0f2c1753be65bdf8e53456c1

Authored by 2c2c2c
1 parent 0fba032a
build: skipped

排班规则里，分段情况下 跨天没有+1

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
  View file @42dd74c
@@ -445,7 +445,7 @@ public class AttendanceServiceImpl implements AttendanceService { @@ -445,7 +445,7 @@ public class AttendanceServiceImpl implements AttendanceService {
445 else { 445 else {
446 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime()))); 446 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
447 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime()))); 447 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
448 - if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) { 448 + if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
449 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime())); 449 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
450 } else { 450 } else {
451 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime()))); 451 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
  View file @42dd74c
@@ -174,7 +174,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper, @@ -174,7 +174,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper,
174 else { 174 else {
175 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime()))); 175 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
176 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime()))); 176 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
177 - if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) { 177 + if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
178 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime())); 178 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
179 } else { 179 } else {
180 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime()))); 180 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));