diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java index 490e573..64d8363 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java @@ -154,7 +154,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ .between(PersonnelPlanLog::getPlanDate, stm, etm) .list(); List plans = planService.lambdaQuery() - .between(PersonnelPlan::getStm, stm, etm) + .nested(o -> o.between(PersonnelPlan::getStm, stm, etm).or().between(PersonnelPlan::getEtm, stm, etm)) .list(); PersonnelPlanLogStatisticsVo vo = new PersonnelPlanLogStatisticsVo();