diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java index 55b9e83..c537eb8 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java @@ -69,7 +69,7 @@ public class FitnessWalkStepRankingController { * @param unitId 单位ID,空字符串表示全部单位 * @param mode 排行范围:today、oneMonth、halfYear、oneYear、activity;all 兼容原活动期间参数 * @param sex 性别:空字符串表示全部,男或女表示指定性别 - * @param ageRange 年龄段:空字符串表示全体,under40、41to50、51to55 表示指定年龄段 + * @param ageRange 年龄段:空字符串表示全体,under40、41to50、51to55、over55 表示指定年龄段;over55 表示年龄大于55岁 * @return Result,data.list 为排行榜数据,data.totalCount 为符合条件的总人数 */ @At @@ -84,7 +84,7 @@ public class FitnessWalkStepRankingController { if (Strings.isNotBlank(sex) && !List.of("男", "女").contains(sex)) { return Result.error("性别筛选参数不正确"); } - if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55").contains(ageRange)) { + if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55", "over55").contains(ageRange)) { return Result.error("年龄段筛选参数不正确"); } String actualMode = Strings.isBlank(mode) ? "today" : mode; @@ -110,7 +110,7 @@ public class FitnessWalkStepRankingController { * @param userId 当前登录用户ID,用于返回“我的指标”和“我的名次” * @param rankingType 排行指标:totalSteps 累计步数、completionRate 目标完成率、complianceDays 达标天数 * @param sex 性别筛选:空字符串表示全部,男或女表示指定性别 - * @param ageRange 年龄段:空字符串表示全体,under40、41to50、51to55 表示指定年龄段 + * @param ageRange 年龄段:空字符串表示全体,under40、41to50、51to55、over55 表示指定年龄段;over55 表示年龄大于55岁 * @param timeRange 时间范围:today 当日、oneMonth 近1个月、halfYear 近半年、oneYear 近1年、activity 活动开始至今 * @param pageNumber 页码,从1开始 * @param pageSize 每页条数,最大50条 @@ -138,7 +138,7 @@ public class FitnessWalkStepRankingController { if (Strings.isNotBlank(sex) && !List.of("男", "女").contains(sex)) { return Result.error("性别筛选参数不正确"); } - if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55").contains(ageRange)) { + if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55", "over55").contains(ageRange)) { return Result.error("年龄段筛选参数不正确"); } String actualTimeRange = Strings.isBlank(timeRange) ? "today" : timeRange; @@ -230,7 +230,7 @@ public class FitnessWalkStepRankingController { * @param unitId 单位ID,空字符串表示全部 * @param mode 排行范围:today、oneMonth、halfYear、oneYear、activity;all 兼容原活动期间参数 * @param sex 性别:空字符串表示全部,男或女表示指定性别 - * @param ageRange 年龄段:空字符串表示全部,under40、41to50、51to55表示指定年龄段 + * @param ageRange 年龄段:空字符串表示全部,under40、41to50、51to55、over55表示指定年龄段;over55 表示年龄大于55岁 * @param response HTTP响应,返回XSSF格式的Excel文件流 */ @At @@ -249,7 +249,7 @@ public class FitnessWalkStepRankingController { if (Strings.isNotBlank(sex) && !List.of("男", "女").contains(sex)) { throw new IllegalArgumentException("性别筛选参数不正确"); } - if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55").contains(ageRange)) { + if (Strings.isNotBlank(ageRange) && !List.of("under40", "41to50", "51to55", "over55").contains(ageRange)) { throw new IllegalArgumentException("年龄段筛选参数不正确"); } String actualMode = Strings.isBlank(mode) ? "today" : mode; diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java index 0f30de1..8567673 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java @@ -92,7 +92,7 @@ public interface FitnessWalkCommonService extends BaseService getStepRankingList(String searchName, diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java index 6c7384d..fbc892c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java @@ -481,7 +481,7 @@ public class FitnessWalkCommonServiceImpl extends BaseServiceImpl=", 51); cnd.and(ageExpression, "<=", 55); + } else if ("over55".equals(ageRange)) { + cnd.and(ageExpression, ">", 55); } if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html index 3b8c24c..2134884 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html @@ -53,6 +53,7 @@ layout("/layouts/platform.html"){ +