From f22867fcf089213b6f13accfc9478f693aef93c3 Mon Sep 17 00:00:00 2001 From: lapuda <577732344@qq.com> Date: Fri, 24 Jul 2026 10:27:39 +0800 Subject: [PATCH] feat: add outdoor fair time and company filters --- .../cms/controller/cms/OutdoorFairController.java | 14 ++++++++++++-- .../com/ruoyi/cms/service/IOutdoorFairService.java | 11 +++++++++++ .../cms/service/impl/OutdoorFairServiceImpl.java | 12 ++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java index df126f7..815a20a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java @@ -124,11 +124,14 @@ public class OutdoorFairController extends BaseController @ApiOperation("查询户外招聘会列表") @PreAuthorize("@ss.hasPermi('cms:outdoorFair:list')") @GetMapping("/list") - public TableDataInfo list(OutdoorFair outdoorFair, HttpServletRequest request) + public TableDataInfo list(OutdoorFair outdoorFair, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, + HttpServletRequest request) { Company company = RoleUtils.isCompanyAdmin() ? getCurrentCompanyOrNull() : null; startPage(); - List list = outdoorFairService.selectOutdoorFairList(outdoorFair); + List list = outdoorFairService.selectOutdoorFairList(outdoorFair, startTime, endTime); fillReservedBoothCount(list); fillCompanyApplyState(list, request, company); return getDataTable(list); @@ -552,12 +555,18 @@ public class OutdoorFairController extends BaseController @PreAuthorize("@ss.hasPermi('cms:outdoorFair:query')") @GetMapping("/{fairId}/companies") public AjaxResult listCompanies(@PathVariable Long fairId, String companyName, + String reviewStatus, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, Integer current, Integer pageSize, HttpServletRequest request) { LambdaQueryWrapper relationWrapper = new LambdaQueryWrapper() .eq(FairCompany::getJobFairId, fairId) .orderByDesc(FairCompany::getId); + relationWrapper.eq(StringUtils.isNotBlank(reviewStatus), FairCompany::getReviewStatus, reviewStatus); + relationWrapper.ge(startTime != null, FairCompany::getCreateTime, startTime); + relationWrapper.le(endTime != null, FairCompany::getCreateTime, endTime); if (RoleUtils.isCompanyAdmin()) { Company company = getCurrentCompanyOrNull(); if (company == null) { @@ -616,6 +625,7 @@ public class OutdoorFairController extends BaseController row.put("reviewBy", relation.getReviewBy()); row.put("reviewTime", relation.getReviewTime()); row.put("reviewRemark", relation.getReviewRemark()); + row.put("registrationTime", relation.getCreateTime()); OutdoorFairDevice device = deviceMap.get(company.getCompanyId()); String h5Url = buildOutdoorFairCompanyH5Url(request, fairId, company.getCompanyId()); row.put("deviceId", device == null ? null : device.getId()); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IOutdoorFairService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IOutdoorFairService.java index 9646cae..b967bbd 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IOutdoorFairService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IOutdoorFairService.java @@ -1,6 +1,7 @@ package com.ruoyi.cms.service; import java.util.Collection; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; @@ -22,6 +23,16 @@ public interface IOutdoorFairService extends IService */ List selectOutdoorFairList(OutdoorFair outdoorFair); + /** + * 按招聘会举办开始/结束时间筛选列表。 + * + * @param outdoorFair 基础查询条件 + * @param startTime 举办开始时间下限 + * @param endTime 举办结束时间上限 + * @return 户外招聘会集合 + */ + List selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime); + /** * 删除户外招聘会及其展位副本、展位预定记录。 * diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/OutdoorFairServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/OutdoorFairServiceImpl.java index ff6431a..d27c44f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/OutdoorFairServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/OutdoorFairServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.cms.service.impl; import java.util.Collection; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -44,6 +45,15 @@ public class OutdoorFairServiceImpl extends ServiceImpl selectOutdoorFairList(OutdoorFair outdoorFair) + { + return selectOutdoorFairList(outdoorFair, null, null); + } + + /** + * 查询户外招聘会列表，并按举办时间边界筛选。 + */ + @Override + public List selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(outdoorFair.getTitle()), OutdoorFair::getTitle, outdoorFair.getTitle()); @@ -52,6 +62,8 @@ public class OutdoorFairServiceImpl extends ServiceImpl