|
@@ -188,12 +188,12 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
|
|
|
private List<CheckJobVO> getJobVO(CheckJobDTO checkJobDTO){
|
|
|
UserInfo userInfo = SecurityUtils.getUserInfo();
|
|
|
-// LocalDate date = LocalDate.now();
|
|
|
-// String lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).toString()+" 23:59:59";
|
|
|
-// String firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).toString()+" 00:00:01";
|
|
|
-// DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
-// checkJobDTO.setActualEndTimeStart(LocalDateTime.parse(firstDay,df));
|
|
|
-// checkJobDTO.setActualEndTimeStart(LocalDateTime.parse(lastDay,df));
|
|
|
+ LocalDate date = LocalDate.now();
|
|
|
+ String lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).toString()+" 23:59:59";
|
|
|
+ String firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).toString()+" 00:00:00";
|
|
|
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ checkJobDTO.setActualEndTimeStart(LocalDateTime.parse(firstDay,df));
|
|
|
+ checkJobDTO.setActualEndTimeStart(LocalDateTime.parse(lastDay,df));
|
|
|
checkJobDTO.setCheckUserId(userInfo.getUserId());
|
|
|
List<CheckJobVO> checkJobVOS = mapper.selectList(checkJobDTO);
|
|
|
return checkJobVOS;
|