Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-06-26 f1c648e7ac1b4c437e7f0c9a69130cb443ca46fd

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java

@@ -131,6 +131,14 @@
    Integer hasPlan_OtherProject(Long planId);

    /**
     * 判断当前计划与最近终止的计划的轮灌组是否有重叠
     * @param planId 当前计划ID
     * @param terminatedPlanId 最近终止的计划ID
     * @return
     */
    Integer hasPlanOverlapWithTerminated(@Param("planId") Long planId, @Param("terminatedPlanId") Long terminatedPlanId);

    /**
     * 根据计划ID获取计划最新状态
     * @param planId
     * @return