diff --git a/docs/app-public-job-fair-api.md b/docs/app-public-job-fair-api.md index 6ba521e..88a2a24 100644 --- a/docs/app-public-job-fair-api.md +++ b/docs/app-public-job-fair-api.md @@ -74,23 +74,19 @@ --- -## 3. 按年份查询每日招聘会数量 +## 3. 查询有招聘会的日期列表 -根据年份查询该年每天的招聘会数量,支持跨天招聘会统计(如招聘会时间为1月12日-14日,则12、13、14日都会统计)。 +获取所有有招聘会的日期列表,支持跨天招聘会(如招聘会时间为1月12日-14日,则12、13、14日都会返回)。 **请求方式:** `GET` -**请求路径:** `/dailyCount/{year}` +**请求路径:** `/dates` -**路径参数:** - -| 参数名 | 类型 | 必填 | 说明 | -|-------|------|-----|------| -| year | Integer | 是 | 年份,如 2026 | +**请求参数:** 无 **请求示例:** ``` -GET /app/jobfair/public/jobfair/dailyCount/2026 +GET /app/jobfair/public/jobfair/dates ``` **响应示例:** @@ -99,26 +95,23 @@ GET /app/jobfair/public/jobfair/dailyCount/2026 "code": 200, "msg": "操作成功", "data": [ - { "date": "2026-01-03", "count": 1 }, - { "date": "2026-01-05", "count": 1 }, - { "date": "2026-01-07", "count": 2 }, - { "date": "2026-01-15", "count": 1 }, - { "date": "2026-01-16", "count": 1 }, - { "date": "2026-02-05", "count": 1 }, - { "date": "2026-02-12", "count": 1 }, - { "date": "2026-02-13", "count": 1 }, - { "date": "2026-02-14", "count": 1 } + "2026-01-03", + "2026-01-05", + "2026-01-07", + "2026-01-11", + "2026-01-15", + "2026-01-16", + "2026-01-25", + "2026-01-26", + "2026-02-05", + "2026-02-10", + "2026-02-12", + "2026-02-13", + "2026-02-14" ] } ``` -**响应字段说明:** - -| 字段名 | 类型 | 说明 | -|-------|------|------| -| date | String | 日期,格式 yyyy-MM-dd | -| count | Integer | 当天招聘会数量 | - --- ## 公共字段说明 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/PublicJobFairController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/PublicJobFairController.java index 06a5a70..960ed67 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/PublicJobFairController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/PublicJobFairController.java @@ -82,12 +82,12 @@ public class PublicJobFairController extends BaseController { } /** - * 按年份查询每日招聘会数量 + * 查询有招聘会的日期列表 */ - @BussinessLog(title = "按年份查询每日招聘会数量") - @ApiOperation("按年份查询每日招聘会数量") - @GetMapping("/dailyCount/{year}") - public AjaxResult dailyCountByYear(@ApiParam("年份") @PathVariable Integer year) { - return success(publicJobFairService.getDailyCountByYear(year)); + @BussinessLog(title = "查询有招聘会的日期列表") + @ApiOperation("查询有招聘会的日期列表") + @GetMapping("/dates") + public AjaxResult getJobFairDates() { + return success(publicJobFairService.getJobFairDates()); } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/rc/PublicJobFairMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/rc/PublicJobFairMapper.java index aefdd45..3cb5122 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/rc/PublicJobFairMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/rc/PublicJobFairMapper.java @@ -48,9 +48,9 @@ public interface PublicJobFairMapper extends BaseMapper { List getCurrentMonthFairs(); /** - * 按年份查询每日招聘会数量 + * 查询有招聘会的日期列表 */ - List getDailyCountByYear(@Param("year") Integer year); + List getJobFairDates(); // ========== CMS后台管理接口 ========== diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/IPublicJobFairService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/IPublicJobFairService.java index 3fd919d..a22ba43 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/IPublicJobFairService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/IPublicJobFairService.java @@ -35,9 +35,9 @@ public interface IPublicJobFairService { List getCurrentMonthFairs(); /** - * 按年份查询每日招聘会数量 + * 查询有招聘会的日期列表 */ - List getDailyCountByYear(Integer year); + List getJobFairDates(); // ========== CMS后台管理接口 ========== diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/impl/PublicJobFairServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/impl/PublicJobFairServiceImpl.java index 602de04..5408ee1 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/impl/PublicJobFairServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/rc/impl/PublicJobFairServiceImpl.java @@ -114,8 +114,8 @@ public class PublicJobFairServiceImpl implements IPublicJobFairService { } @Override - public List getDailyCountByYear(Integer year) { - return publicJobFairMapper.getDailyCountByYear(year); + public List getJobFairDates() { + return publicJobFairMapper.getJobFairDates(); } // ========== CMS后台管理接口实现 ========== diff --git a/ruoyi-bussiness/src/main/resources/mapper/rc/PublicJobFairMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/rc/PublicJobFairMapper.xml index 9c2ca38..87b48d4 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/rc/PublicJobFairMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/rc/PublicJobFairMapper.xml @@ -251,9 +251,8 @@ order by job_fair_start_time desc - + SELECT DISTINCT TO_CHAR(d.date, 'YYYY-MM-DD') AS date FROM public_job_fair f, generate_series( DATE_TRUNC('day', f.job_fair_start_time), @@ -261,8 +260,6 @@ '1 day'::interval ) AS d(date) WHERE f.del_flag = '0' - AND TO_CHAR(d.date, 'YYYY') = CAST(#{year} AS VARCHAR) - GROUP BY TO_CHAR(d.date, 'YYYY-MM-DD') ORDER BY date