From 1335e14e0bc53ae5ee35524d60f86d6add6ca4d6 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 14 Nov 2024 16:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=9F=B9=E8=AE=AD=E6=9C=9F?=
 =?UTF-8?q?=E6=95=B0/=E4=BA=BA=E6=AC=A1=E8=AE=A1=E7=AE=97=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/PersonnelPlanLogController.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<PersonnelPlan> 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();