Skip to content

Commit

Permalink
🦷 :: (#814) μ§€μ›μ„œ νŽ˜μ΄μ§• μΆ”κ°€
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyoil2 committed Nov 5, 2024
1 parent 4c773b3 commit f10ca55
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public List<ApplicationVO> getAllByConditions(ApplicationFilter filter) {
eqWinterIntern(filter.getWinterIntern()),
eqYear(filter.getYear())
)
.offset(filter.getOffset())
.limit(filter.getLimit())
.orderBy(
applicationEntity.updatedAt.desc(),
applicationEntity.createdAt.desc()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public TeacherQueryApplicationsResponse queryTeacherApplicationList(
@RequestParam(value = "recruitment_id", required = false) Long recruitmentId,
@RequestParam(value = "winter_intern", required = false) Boolean winterIntern,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy") Year year,
@RequestParam(value = "page", defaultValue = "1") @Positive Long page
@RequestParam(value = "page", required = false, defaultValue = "1") @Positive Long page
) {
return queryApplicationListService.execute(applicationStatus, studentName, recruitmentId, winterIntern, year, page);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,10 @@ public List<TeacherCompaniesVO> getByConditions(CompanyFilter filter) {
eqRegion(filter.getRegion()),
eqBusinessArea(filter.getBusinessArea())
)
.offset(filter.getOffset())
.limit(filter.getLimit())
.orderBy(recruitmentEntity.recruitYear.desc());

if (filter.getPage() != null) {
query
.offset(filter.getOffset())
.limit(filter.getLimit());
}

return query
.fetch().stream()
.map(TeacherCompaniesVO.class::cast)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public TeacherQueryCompaniesResponse queryCompanies(
@RequestParam(value = "name", required = false) String companyName,
@RequestParam(value = "region", required = false) String region,
@RequestParam(value = "business_area", required = false) Long businessArea,
@RequestParam(value = "page", required = false) @Positive Long page
@RequestParam(value = "page", required = false ,defaultValue = "1") @Positive Long page
) {
return teacherQueryCompaniesUseCase.execute(type, companyName, region, businessArea, page);
}
Expand Down

0 comments on commit f10ca55

Please sign in to comment.