|
@@ -761,15 +761,16 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}else {
|
|
}else {
|
|
|
days++;
|
|
days++;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
newUserlock.setClockDate(s);
|
|
newUserlock.setClockDate(s);
|
|
|
newUserlock.setClockTime(LocalDate.of(year,month,days));
|
|
newUserlock.setClockTime(LocalDate.of(year,month,days));
|
|
|
- int startHour = Integer.parseInt(split[0].split(":")[0].trim());
|
|
|
|
|
- int startMinute = Integer.parseInt(split[0].split(":")[1].trim());
|
|
|
|
|
|
|
+ int startHour = Integer.parseInt(getTime(split[0].split(":")[0]));
|
|
|
|
|
+ int startMinute = Integer.parseInt(getTime(split[0].split(":")[1]));
|
|
|
LocalDateTime startTime=LocalDateTime.of(year,month,days,startHour,startMinute);
|
|
LocalDateTime startTime=LocalDateTime.of(year,month,days,startHour,startMinute);
|
|
|
newUserlock.setStartTime(startTime);
|
|
newUserlock.setStartTime(startTime);
|
|
|
if (newUserlock.getStauts()==0){
|
|
if (newUserlock.getStauts()==0){
|
|
|
- int endHour = Integer.parseInt(split[split.length - 1].split(":")[0].trim());
|
|
|
|
|
- int endMinute = Integer.parseInt(split[split.length - 1].split(":")[1].trim());
|
|
|
|
|
|
|
+ int endHour = Integer.parseInt(getTime(split[split.length - 1].split(":")[0]));
|
|
|
|
|
+ int endMinute = Integer.parseInt(getTime(split[split.length - 1].split(":")[1]));
|
|
|
LocalDateTime endTime=LocalDateTime.of(year,month,days,endHour,endMinute);
|
|
LocalDateTime endTime=LocalDateTime.of(year,month,days,endHour,endMinute);
|
|
|
newUserlock.setEndTime(endTime);
|
|
newUserlock.setEndTime(endTime);
|
|
|
Double hours = getHuors(startTime, endTime);
|
|
Double hours = getHuors(startTime, endTime);
|
|
@@ -807,6 +808,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
return list;
|
|
return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private String getTime(String s) {
|
|
|
|
|
+ return s.replace("外勤","").trim();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
private Double getHuors(LocalDateTime startTime, LocalDateTime endTime) {
|
|
private Double getHuors(LocalDateTime startTime, LocalDateTime endTime) {
|