diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
index dad5608..5303281 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java
@@ -128,10 +128,19 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
     private void validEntityBeforeSave(BgtProjectRecruit entity){
         if(entity.getId()!=null){
 			BgtProjectRecruit recruit = getById(entity.getId());
+			if(recruit == null) {
+				throw new BaseException("招工数据不存在");
+			}
 			LocalDate recruitEndTime = recruit.getRecruitEndTime();
 			if(recruitEndTime.isBefore(LocalDate.now())) {
 				throw new BaseException("已过报名截止时间，无法修改");
 			}
+			if(recruit.getRecruitStaffNum()>entity.getRecruitStaffNum()) {
+				throw new BaseException("招工人数不能少于修改前的人数");
+			}
+			if(recruit.getRecruitStaffNum() < entity.getRecruitStaffNum() && RecruitStatus.FULL.getCode().equals(recruit.getStatus())) {
+				entity.setStatus(RecruitStatus.PROGRESS.getCode());
+			}
 		}
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
index e10cced..b326afa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
@@ -35,16 +35,17 @@ import com.ruoyi.wgz.domain.WgzAttendance;
 import com.ruoyi.wgz.domain.WgzReissueacard;
 import com.ruoyi.wgz.mapper.WgzAttendanceMapper;
 import com.ruoyi.wgz.service.IWgzAttendanceService;
-import com.ruoyi.wgz.service.IWgzLeaveService;
 import com.ruoyi.wgz.service.IWgzReissueacardService;
-import com.ruoyi.wgz.service.IWgzUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DecimalFormat;
-import java.time.*;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
@@ -467,14 +468,15 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 		FbsProjectTask task = taskService.getById(dto.getTaskId());
 		validTaskTime(task, dto.getDate());
 
-		LocalDate taskBeginTime = DateUtils.str2Localdate(task.getTaskBeginTime(), DateUtils.YYYY_MM_DD);
+		LocalDate taskEndTime = DateUtils.str2Localdate(task.getTaskEndTime(), DateUtils.YYYY_MM_DD);
 		LocalDate date = dto.getDate();
-
+		LocalDate endTime = date;
 		LocalDate startTime = date.minusDays(7);
-		if (taskBeginTime!=null &&taskBeginTime.isAfter(startTime)){
-			startTime = taskBeginTime;
+		if (taskEndTime!=null &&taskEndTime.isBefore(date)){
+			endTime = taskEndTime;
 		}
-		return countDayByTaskId(dto.getTaskId(), startTime, date);
+		List<BgtDayAttendanceCountVO> bgtDayAttendanceCountVOS = countDayByTaskId(dto.getTaskId(), startTime, endTime);
+		return DataUtil.fillMissingDates(bgtDayAttendanceCountVOS, startTime, endTime);
 	}