|
|
@@ -160,6 +160,18 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
Long aid=loginUser.getUserId();
|
|
|
List<MyMonthDays> myMonthDays = projectStaffRecordMapper.myDurationMonth(id, aid,firsDayOfMonth,lastDayOfMonth + " 23:59:59");
|
|
|
supplementMyMonthDays(myMonthDays,firsDayOfMonth,lastDayOfMonth);
|
|
|
+ pushMyMonthDay(myMonthDays, projectTask, date, maxDuration);
|
|
|
+ return AjaxResult.success(myMonthDays);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 将月数据状态填充
|
|
|
+ * @param myMonthDays 月基本数据
|
|
|
+ * @param projectTask 项目情况
|
|
|
+ * @param date 当前日期
|
|
|
+ * @param maxDuration 最大工时
|
|
|
+ */
|
|
|
+ private void pushMyMonthDay(List<MyMonthDays> myMonthDays, ProjectTask projectTask, String date, BigDecimal maxDuration) {
|
|
|
for (MyMonthDays myMonthDay : myMonthDays) {
|
|
|
DateUtils.getWeeks(myMonthDay.getDates());
|
|
|
// 0 =未到时限 1=满工时,2=未打卡,3=未满工时,4=不属于打卡区间
|
|
|
@@ -178,11 +190,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
myMonthDay.setStatus(5);
|
|
|
}
|
|
|
}
|
|
|
- return AjaxResult.success(myMonthDays);
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public AjaxResult recordDetails(Long id) {
|
|
|
return AjaxResult.success(projectStaffRecordMapper.selectDetailsById(id));
|
|
|
@@ -311,6 +321,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
}
|
|
|
myMonthDays.clear();
|
|
|
myMonthDays.addAll(list);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private static List<Map<String,Object>> getMonthDays(String firsDayOfMonth, String lastDayOfMonth) {
|