计划培训期数/人次计算规则修改

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