yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划年度筛选规则错误修改

master
徐杰盟 2024-11-14 15:31:01 +08:00
parent f863285523
commit 3b440067e6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java
View File

@ -132,14 +132,23 @@ public class PersonnelPlanController extends AbstractCommonFileController {
LambdaQueryWrapper<PersonnelPlan> query = Wrappers.lambdaQuery(); LambdaQueryWrapper<PersonnelPlan> query = Wrappers.lambdaQuery();
Date stm = page.getStm(); Date stm = page.getStm();
if (Objects.nonNull(stm)) { Date etm = page.getEtm();
query.ge(PersonnelPlan::getStm, stm);
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(); String name = page.getName();
if (StringUtils.isNotBlank(name)) { if (StringUtils.isNotBlank(name)) {