From 84b970ab181c876314a9b01c065a52a4324b5df8 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 26 三月 2025 16:45:39 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java index 8ef4634..1cbb726 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java @@ -2,16 +2,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan; -import com.dy.pipIrrGlobal.voIr.VoIrrigatePlan; +import com.dy.pipIrrGlobal.voIr.VoPlanSimple; +import com.dy.pipIrrGlobal.voIr.VoPlans; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; -import java.util.Map; /** * @author ZhuBaoMin - * @date 2025-02-20 15:33 - * @LastEditTime 2025-02-20 15:33 + * @date 2025-02-25 14:59 + * @LastEditTime 2025-02-25 14:59 * @Description */ @@ -30,23 +32,48 @@ int updateByPrimaryKey(IrIrrigatePlan record); /** - * 鍙戝竷鎸囧畾鐨勭亴婧夎鍒� + * 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇鍚姩妯″紡 * @param planId * @return */ - int publishIrrigatePlan(Long planId); + Byte getStartupMode(Long planId); /** * 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掓暟閲� * @param params * @return */ - Long getIrrigatePlanCount(Map<?, ?> params); + //Long getIrrigatePlanCount(Map<?, ?> params); /** * 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛� * @param params * @return */ - List<VoIrrigatePlan> getIrrigatePlans(Map<?, ?> params); + //List<VoIrrigatePlan> getIrrigatePlans(Map<?, ?> params); + + /** + * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭� + * @return + */ + VoPlanSimple getPlanSimple(Long planId); + + /** + * 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級 + * @param planId + * @return + */ + Integer updatePlanTimes(@Param("planStartTime") Date planStartTime, @Param("planStopTime") Date planEndTime, @Param("planId") Long planId); + + /** + * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢� + * @return + */ + List<VoPlans> getNotCompletePlans(); + + /** + * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢� + * @return + */ + List<VoPlans> getCompletedPlans(); } \ No newline at end of file -- Gitblit v1.8.0