|
|
@@ -831,11 +831,12 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
if (dayOfMonth.equals(date)) {
|
|
|
BigDecimal projectDuration = (BigDecimal) map2.get("projectDuration");
|
|
|
BigDecimal added = projectDuration.add(BigDecimal.valueOf(e.getDuration()));
|
|
|
+ BigDecimal checkDuration = BigDecimal.valueOf(e.getCheckDuration());
|
|
|
map2.put("projectDuration", added);
|
|
|
- if (added.compareTo(BigDecimal.valueOf(8))>=0){
|
|
|
+ if (projectDuration.compareTo(checkDuration) >= 0){
|
|
|
map2.put("notDuration", BigDecimal.valueOf(0));
|
|
|
}else {
|
|
|
- map2.put("notDuration", BigDecimal.valueOf(8).subtract(added));
|
|
|
+ map2.put("notDuration", checkDuration.subtract(added));
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -928,8 +929,8 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
map.put("week","日");
|
|
|
break;
|
|
|
}
|
|
|
- map.put("projectDuration", BigDecimal.valueOf(0));
|
|
|
- map.put("notDuration", BigDecimal.valueOf(8));
|
|
|
+ map.put("projectDuration", BigDecimal.ZERO);
|
|
|
+ map.put("notDuration", BigDecimal.ZERO);
|
|
|
list.add(map);
|
|
|
startDate = startDate.plusDays(1);
|
|
|
}
|
|
|
@@ -944,11 +945,13 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
Integer date = (Integer) map2.get("date");
|
|
|
if (recordTime.getDayOfMonth()==date) {
|
|
|
BigDecimal projectDuration = BigDecimal.valueOf(e.getDuration());
|
|
|
+ BigDecimal checkDuration = BigDecimal.valueOf(e.getCheckDuration());
|
|
|
map2.put("projectDuration", projectDuration);
|
|
|
- if (projectDuration.compareTo(BigDecimal.valueOf(8))>=0){
|
|
|
+ map2.put("checkDuration", checkDuration);
|
|
|
+ if (projectDuration.compareTo(checkDuration) >= 0){
|
|
|
map2.put("notDuration", BigDecimal.valueOf(0));
|
|
|
}else {
|
|
|
- map2.put("notDuration", BigDecimal.valueOf(8).subtract(projectDuration));
|
|
|
+ map2.put("notDuration", checkDuration.subtract(projectDuration));
|
|
|
}
|
|
|
break;
|
|
|
}
|