|
|
@@ -1026,6 +1026,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
title = list.get(0).get(0);
|
|
|
String[] split = title.split(" ");
|
|
|
String date =split[split.length - 1];
|
|
|
+ LocalDate localDate = DateUtils.parseLocalDate(date,"yyyy年MM月");
|
|
|
//标题
|
|
|
List<String> title2 = new ArrayList<>(list.get(2).values());
|
|
|
System.out.println(title2);
|
|
|
@@ -1046,8 +1047,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
String str = o.toString();
|
|
|
userClockDataDetailsBo.setDuration(new BigDecimal(str));
|
|
|
String s = title2.get(index);
|
|
|
- userClockDataDetailsBo.setDateStr(s);
|
|
|
- LocalDate localDate = LocalDate.parse(date);
|
|
|
+ userClockDataDetailsBo.setDateStr(str);
|
|
|
if (s.equals("六")||s.equals("日")){
|
|
|
day++;
|
|
|
LocalDate localDate1 = localDate.withDayOfMonth(day);
|