|
@@ -1040,8 +1040,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
userClockDataBo.setJobNumber((String) map.get(0));
|
|
userClockDataBo.setJobNumber((String) map.get(0));
|
|
|
userClockDataBo.setUsername((String) map.get(1));
|
|
userClockDataBo.setUsername((String) map.get(1));
|
|
|
List<UserClockDataDetailsBo> ul = new ArrayList<>();
|
|
List<UserClockDataDetailsBo> ul = new ArrayList<>();
|
|
|
- int index = 0;
|
|
|
|
|
|
|
+ int index = 2;
|
|
|
int day = 0;
|
|
int day = 0;
|
|
|
|
|
+ list2=list2.subList(2,size-1);
|
|
|
for (Object o : list2) {
|
|
for (Object o : list2) {
|
|
|
UserClockDataDetailsBo userClockDataDetailsBo = new UserClockDataDetailsBo();
|
|
UserClockDataDetailsBo userClockDataDetailsBo = new UserClockDataDetailsBo();
|
|
|
String str = o.toString();
|
|
String str = o.toString();
|
|
@@ -1059,11 +1060,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
userClockDataDetailsBo.setDate(localDate1);
|
|
userClockDataDetailsBo.setDate(localDate1);
|
|
|
}
|
|
}
|
|
|
ul.add(userClockDataDetailsBo);
|
|
ul.add(userClockDataDetailsBo);
|
|
|
- if (list2.size() == index + 1){
|
|
|
|
|
- index=0;
|
|
|
|
|
- }else {
|
|
|
|
|
- index++;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ index++;
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
userClockDataBo.setList(ul);
|
|
userClockDataBo.setList(ul);
|