From 3b440067e6cd6a03dc9f8bd8e88994e86f4645c4 Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 14 Nov 2024 15:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B9=B4=E5=BA=A6=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E8=A7=84=E5=88=99=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonnelPlanController.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 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 8a6f0cf..be0ea68 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java @@ -132,14 +132,23 @@ public class PersonnelPlanController extends AbstractCommonFileController { LambdaQueryWrapper query = Wrappers.lambdaQuery(); Date stm = page.getStm(); - if (Objects.nonNull(stm)) { - query.ge(PersonnelPlan::getStm, stm); + Date etm = page.getEtm(); + + if (Objects.nonNull(etm) && Objects.nonNull(stm)){ + query.nested(o -> o.between(PersonnelPlan::getStm, stm, etm).or().between(PersonnelPlan::getEtm, stm, etm)); + }else{ + + if (Objects.nonNull(stm)) { + query.ge(PersonnelPlan::getStm, stm); + } + + if (Objects.nonNull(etm)) { + query.le(PersonnelPlan::getEtm, etm); + } } - Date etm = page.getEtm(); - if (Objects.nonNull(etm)) { - query.le(PersonnelPlan::getEtm, etm); - } + + String name = page.getName(); if (StringUtils.isNotBlank(name)) {