diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index d12ed41..fd946e2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -33,14 +33,12 @@ import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo; +import com.ruoyi.wgz.domain.WgzAttendance; import com.ruoyi.wgz.domain.WgzDailyClock; import com.ruoyi.wgz.domain.WgzMessage; import com.ruoyi.wgz.domain.WgzUser; import com.ruoyi.wgz.mapper.WgzDailyClockMapper; -import com.ruoyi.wgz.service.IWgzDailyClockService; -import com.ruoyi.wgz.service.IWgzLeaveService; -import com.ruoyi.wgz.service.IWgzMessageService; -import com.ruoyi.wgz.service.IWgzUserService; +import com.ruoyi.wgz.service.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -91,6 +89,9 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl apply1 = new LambdaQueryWrapper() + .eq(WgzAttendance::getApplyKey, by.getId()) + .eq(WgzAttendance::getUserId, appUserId) + .orderByAsc(WgzAttendance::getId) + .last("limit 1"); + WgzAttendance one1 = iWgzAttendanceService.getOne(apply1); + if (one1 != null) { + LocalDate date = one1.getDate(); + fh.put(date.toString(),new WgzAppAttachmentAcquisitionTwo().setStatus("1")); + } //5、查看fh的key最大和最小的日期之间差哪些日期,然后补齐数据 LocalDate minDate = fh.keySet().stream().map(LocalDate::parse).min(LocalDate::compareTo).orElse(null); LocalDate now = LocalDate.now();