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 815a20a..6ef6343 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 @@ -127,11 +127,14 @@ public class OutdoorFairController extends BaseController 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, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date applyStartTime, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date applyEndTime, HttpServletRequest request) { Company company = RoleUtils.isCompanyAdmin() ? getCurrentCompanyOrNull() : null; startPage(); - List list = outdoorFairService.selectOutdoorFairList(outdoorFair, startTime, endTime); + List list = outdoorFairService.selectOutdoorFairList( + outdoorFair, startTime, endTime, applyStartTime, applyEndTime); fillReservedBoothCount(list); fillCompanyApplyState(list, request, company); return getDataTable(list); 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 b967bbd..e00987e 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 @@ -33,6 +33,19 @@ public interface IOutdoorFairService extends IService */ List selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime); + /** + * 按招聘会举办和报名时间边界筛选列表。 + * + * @param outdoorFair 基础查询条件 + * @param startTime 举办开始时间下限 + * @param endTime 举办结束时间上限 + * @param applyStartTime 报名开始时间下限 + * @param applyEndTime 报名截止时间上限 + * @return 户外招聘会集合 + */ + List selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime, + Date applyStartTime, Date applyEndTime); + /** * 删除户外招聘会及其展位副本、展位预定记录。 * 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 d27c44f..82d5aba 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 @@ -54,6 +54,16 @@ public class OutdoorFairServiceImpl extends ServiceImpl selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime) + { + return selectOutdoorFairList(outdoorFair, startTime, endTime, null, null); + } + + /** + * 查询户外招聘会列表,并按举办和报名时间边界筛选。 + */ + @Override + public List selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime, + Date applyStartTime, Date applyEndTime) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(outdoorFair.getTitle()), OutdoorFair::getTitle, outdoorFair.getTitle()); @@ -64,6 +74,8 @@ public class OutdoorFairServiceImpl extends ServiceImpl