zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改es开始时间和截至时间报错问题

Browse Source
This commit is contained in:
chenshaohua
2026-07-08 16:29:07 +08:00
parent f42ef9c83a
commit d692c7915f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
View File

@@ -720,13 +720,17 @@ public class ESJobSearchImpl implements IESJobSearchService
//开始时间 //开始时间
Date startDate = jobQuery.getStartDate(); Date startDate = jobQuery.getStartDate();
Date endDate = jobQuery.getEndDate(); Date endDate = jobQuery.getEndDate();
if (Objects.nonNull(startDate)) { if (Objects.nonNull(startDate) || Objects.nonNull(endDate)) {
String startStr = DateUtils.UTC_FORMATTER.format(startDate.toInstant()); wrapper.and(w -> {
wrapper.ge(ESJobDocument::getPostingDate, startStr); if (Objects.nonNull(startDate)) {
} String startStr = DateUtils.ES_DATE_FORMATTER.format(startDate.toInstant());
if (Objects.nonNull(endDate)) { w.ge(ESJobDocument::getPostingDate, startStr);
String endStr = DateUtils.UTC_FORMATTER.format(endDate.toInstant()); }
wrapper.le(ESJobDocument::getPostingDate, endStr); if (Objects.nonNull(endDate)) {
String endStr = DateUtils.ES_DATE_FORMATTER.format(endDate.toInstant());
w.le(ESJobDocument::getPostingDate, endStr);
}
});
} }
// 先开启打分、优先按匹配分数排序（关键词前台命中越高越靠前） // 先开启打分、优先按匹配分数排序（关键词前台命中越高越靠前）
wrapper.trackScores(); wrapper.trackScores();

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@@ -37,8 +37,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
public static final DateTimeFormatter UTC_FORMATTER = DateTimeFormatter public static final DateTimeFormatter ES_DATE_FORMATTER = DateTimeFormatter
.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .ofPattern("yyyy-MM-dd HH:mm:ss")
.withZone(ZoneId.of("UTC")); .withZone(ZoneId.of("UTC"));
/** /**