diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java index 3465216..5f7dc5d 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java @@ -120,8 +120,12 @@ public class PersonnelPlanController extends AbstractCommonFileController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery() + public R> list(@RequestBody @Validated PersonnelPlanPage dto) { + LambdaQueryChainWrapper query = service.lambdaQuery(); + if (StringUtils.isNotBlank(dto.getName())){ + query.like(PersonnelPlan::getName, dto.getName()); + } + return R.ok(query .eq(PersonnelPlan::getStatus, 1) .list()); } diff --git a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java index c3e3beb..15fee12 100644 --- a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java +++ b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java @@ -63,10 +63,10 @@ public class PersonnelPlan extends CommUpdate implements Serializable { * 培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他 */ @TableField(value="type") - @Excel(name = "培训主题",sort = 2,readConverterExp = "0=水利,1=岗前培训,2=在岗培训,3=政治学习教育,4=其他") - @Schema(description="培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") + @Excel(name = "培训主题",sort = 2,readConverterExp = "1=水利,2=岗前培训,3=在岗培训,4=政治学习教育,5=其他") + @Schema(description="培训主题分类,1:水利,2:岗前培训,3:在岗培训,4:政治学习教育,5:其他") @NotNull(message = "培训主题不能为空",groups = {Insert.class, Update.class}) - @Pattern(regexp = "^[0-4]$", message = "培训主题分类应为:0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") + @Pattern(regexp = "^[0-4]$", message = "培训主题分类应为:1:水利,2:岗前培训,3:在岗培训,4:政治学习教育,5:其他") private Integer type; /**