feat: add outdoor fair registration time filters
This commit is contained in:
@@ -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<OutdoorFair> list = outdoorFairService.selectOutdoorFairList(outdoorFair, startTime, endTime);
|
||||
List<OutdoorFair> list = outdoorFairService.selectOutdoorFairList(
|
||||
outdoorFair, startTime, endTime, applyStartTime, applyEndTime);
|
||||
fillReservedBoothCount(list);
|
||||
fillCompanyApplyState(list, request, company);
|
||||
return getDataTable(list);
|
||||
|
||||
@@ -33,6 +33,19 @@ public interface IOutdoorFairService extends IService<OutdoorFair>
|
||||
*/
|
||||
List<OutdoorFair> selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime);
|
||||
|
||||
/**
|
||||
* 按招聘会举办和报名时间边界筛选列表。
|
||||
*
|
||||
* @param outdoorFair 基础查询条件
|
||||
* @param startTime 举办开始时间下限
|
||||
* @param endTime 举办结束时间上限
|
||||
* @param applyStartTime 报名开始时间下限
|
||||
* @param applyEndTime 报名截止时间上限
|
||||
* @return 户外招聘会集合
|
||||
*/
|
||||
List<OutdoorFair> selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime,
|
||||
Date applyStartTime, Date applyEndTime);
|
||||
|
||||
/**
|
||||
* 删除户外招聘会及其展位副本、展位预定记录。
|
||||
*
|
||||
|
||||
@@ -54,6 +54,16 @@ public class OutdoorFairServiceImpl extends ServiceImpl<OutdoorFairMapper, Outdo
|
||||
*/
|
||||
@Override
|
||||
public List<OutdoorFair> selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime)
|
||||
{
|
||||
return selectOutdoorFairList(outdoorFair, startTime, endTime, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询户外招聘会列表,并按举办和报名时间边界筛选。
|
||||
*/
|
||||
@Override
|
||||
public List<OutdoorFair> selectOutdoorFairList(OutdoorFair outdoorFair, Date startTime, Date endTime,
|
||||
Date applyStartTime, Date applyEndTime)
|
||||
{
|
||||
LambdaQueryWrapper<OutdoorFair> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.like(StringUtils.isNotBlank(outdoorFair.getTitle()), OutdoorFair::getTitle, outdoorFair.getTitle());
|
||||
@@ -64,6 +74,8 @@ public class OutdoorFairServiceImpl extends ServiceImpl<OutdoorFairMapper, Outdo
|
||||
queryWrapper.eq(outdoorFair.getOnlineApply() != null, OutdoorFair::getOnlineApply, outdoorFair.getOnlineApply());
|
||||
queryWrapper.ge(startTime != null, OutdoorFair::getHoldTime, startTime);
|
||||
queryWrapper.le(endTime != null, OutdoorFair::getEndTime, endTime);
|
||||
queryWrapper.ge(applyStartTime != null, OutdoorFair::getApplyStartTime, applyStartTime);
|
||||
queryWrapper.le(applyEndTime != null, OutdoorFair::getApplyEndTime, applyEndTime);
|
||||
queryWrapper.orderByDesc(OutdoorFair::getHoldTime);
|
||||
queryWrapper.orderByDesc(OutdoorFair::getCreateTime);
|
||||
return list(queryWrapper);
|
||||
|
||||
Reference in New Issue
Block a user