diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesPdfFileQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesPdfFileQueryExe.java index 4807481..02e6556 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesPdfFileQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesPdfFileQueryExe.java @@ -8,8 +8,13 @@ import com.zcloud.edu.persistence.dataobject.archives.ArchivesPdfFileDO; import com.zcloud.edu.persistence.repository.archives.ArchivesPdfFileRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Component; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -33,6 +38,30 @@ public class ArchivesPdfFileQueryExe { * @return */ public PageResponse execute(ArchivesPdfFilePageQry archivesPdfFilePageQry) { + DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + if(StringUtils.isNotEmpty(archivesPdfFilePageQry.getGeCreateTime())){ + //增加上00:00:00 + String dateStr = archivesPdfFilePageQry.getGeCreateTime(); + try { + LocalDate date = LocalDate.parse(dateStr, dateFormatter); + LocalDateTime startDateTime = date.atStartOfDay(); + archivesPdfFilePageQry.setGeCreateTime(startDateTime.toString().replace('T', ' ')); + } catch (Exception e) { + } + } + if(StringUtils.isNotEmpty(archivesPdfFilePageQry.getLeCreateTime())){ + //增加上23:59:59 + String dateStr = archivesPdfFilePageQry.getLeCreateTime(); + try { + LocalDate date = LocalDate.parse(dateStr, dateFormatter); + LocalDateTime endDateTime = date.atTime(LocalTime.MAX); + archivesPdfFilePageQry.setLeCreateTime(endDateTime.toString().replace('T', ' ')); + } catch (Exception e) { + } + } + + + Map params = PageQueryHelper.toHashMap(archivesPdfFilePageQry); PageResponse pageResponse = archivesPdfFileRepository.listPage(params); List examCenterCOS = archivesPdfFileCoConvertor.converDOsToCOs(pageResponse.getData());