From 9be59053f1397b25822d5f4dc04244b90fb9f35d Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 9 Mar 2026 09:07:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(archives):=20=E6=B7=BB=E5=8A=A0=E6=A1=A3?= =?UTF-8?q?=E6=A1=88PDF=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/ArchivesPdfFileQueryExe.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) 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());