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)) {