diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialProjectController.java b/src/main/java/org/springblade/modules/martial/controller/MartialProjectController.java index 11cd867..2093ea0 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialProjectController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialProjectController.java @@ -57,6 +57,10 @@ public class MartialProjectController extends BladeController { if (StringUtil.isNotBlank(project.getCategory())) { queryWrapper.like("category", project.getCategory()); } + // 项目类型精确匹配 + if (project.getEventType() != null) { + queryWrapper.eq("event_type", project.getEventType()); + } // 参赛类型精确匹配 if (project.getType() != null) { queryWrapper.eq("type", project.getType()); diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java index 3b4fd2c..51c389b 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java @@ -63,6 +63,13 @@ public class MartialProject extends TenantEntity { @Schema(description = "组别") private String category; + /** + * 项目类型(1-套路,2-散打,3-器械,4-对练) + */ + @Schema(description = "项目类型") + @com.baomidou.mybatisplus.annotation.TableField("event_type") + private Integer eventType; + /** * 类型(1-个人,2-双人,3-集体) */