From 39be193dece5ad6314aa22a41a2c8675e8057be3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:19:36 +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/daoRm/RmCommandHistoryMapper.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
index 48bc0a5..20e64a6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
@@ -2,29 +2,31 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.pipIrrGlobal.voRm.VoCommand;
 import com.dy.pipIrrGlobal.voRm.VoUnclosedParam;
 import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
- * @date 2024-05-24 10:46
- * @LastEditTime 2024-05-24 10:46
+ * @date 2024-07-17 10:31
+ * @LastEditTime 2024-07-17 10:31
  * @Description
  */
 
 @Mapper
 public interface RmCommandHistoryMapper extends BaseMapper<RmCommandHistory> {
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long comId);
 
     int insert(RmCommandHistory record);
 
     int insertSelective(RmCommandHistory record);
 
-    RmCommandHistory selectByPrimaryKey(Long id);
+    RmCommandHistory selectByPrimaryKey(Long comId);
 
     int updateByPrimaryKeySelective(RmCommandHistory record);
 
@@ -43,5 +45,26 @@
      * @param intakeId
      * @return
      */
-    VoUnclosedParam getUncloseParam(Long intakeId);
+    VoUnclosedParam getUncloseParam(@Param("onLineMap") String onLineMap, @Param("intakeId")Long intakeId);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍鎬绘暟
+     * @param params
+     * @return
+     */
+    Long getCommandHistoriesCount(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍
+     * @param params
+     * @return
+     */
+    List<VoCommand> getCommandHistories(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇棰勭害鏃堕棿锛屽悜铏氭嫙鍗″啓寮�闃�鏃堕棿鐢�
+     * @param commId
+     * @return
+     */
+    String getTimeByCommId(Long commId);
 }
\ No newline at end of file

--
Gitblit v1.8.0