|
|
@@ -190,7 +190,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
for (MyMonthDays myMonthDay : myMonthDays) {
|
|
|
DateUtils.getWeeks(myMonthDay.getDates());
|
|
|
// status 0=未打卡,1=未满工时,2=满工时
|
|
|
-// daystatus 0=正常,1=不属于打卡区间,2=未到时限,3=补班,4=法定节假日
|
|
|
+// daystatus 0=正常,1=不属于打卡区间,2=未到时限,3=补班,4=法定节假日,5=周末
|
|
|
pushLeaglHolidays(legalHolidays,myMonthDay);
|
|
|
if (compareTo(projectTask.getStartTime(),myMonthDay.getDates(),0)||compareTo(projectTask.getEndTime(),myMonthDay.getDates(),1)){
|
|
|
myMonthDay.setDayStatus(1);
|
|
|
@@ -210,6 +210,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
private void pushLeaglHolidays(List<LegalHolidays> list, MyMonthDays myMonthDay) {
|
|
|
String dates = myMonthDay.getDates();
|
|
|
myMonthDay.setDayStatus(0);
|
|
|
+ if (myMonthDay.getWeek()==0||myMonthDay.getWeek()==6){
|
|
|
+ myMonthDay.setDayStatus(5);
|
|
|
+ }
|
|
|
List<HolidaysBo> boList=new ArrayList<>();
|
|
|
for (LegalHolidays e : list) {
|
|
|
String parseStr = DateUtils.parseStrYYYYnMMyDD(e.getHolidays());
|