From aa2b660f0b671c2579040de3a1d6072242472c4c Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 15 Nov 2024 16:59:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E8=A7=A3=E9=87=8A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gunshi/project/xyt/model/PersonnelPlan.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; /** From 6c3af674f364d8945bba7685356586aab225ee06 Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 15 Nov 2024 17:03:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/xyt/controller/PersonnelPlanController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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()); }