From 0eaef592517ced667ed16413f9d22ab677915101 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 02 四月 2024 11:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
index 3dff9b3..a1803ac 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
@@ -60,16 +60,33 @@
      */
     public QueryResultVo<List<VoFlowMeter>> getFlowMeters(QueryVoFlowMeter queryVo){
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
-
+        Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params);
         QueryResultVo<List<VoFlowMeter>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = queryVo.pageSize ;
         rsVo.pageCurr = queryVo.pageCurr ;
 
         // 璁$畻绗﹀悎鏉′欢鐨勮褰曟暟
-        Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params);
         rsVo.calculateAndSet(itemTotal.longValue(), params);
         rsVo.obj = prFlowmeterMapper.getFlowMeters(params);
 
         return rsVo ;
     }
+
+    /**
+     * 寰楀埌鍏ㄩ儴娴侀噺璁�
+     * @return
+     */
+    public List<PrFlowmeter> getFlowMeterAll(){
+        List<PrFlowmeter> all = prFlowmeterMapper.selectAll();
+        return all;
+    }
+
+    /**
+     * 缁欐祦閲忚琛ㄥ姞鐩戞祴绔橧D澶栭敭
+     * @param
+     * @return
+     */
+    public Integer flowmeterAddMonId(PrFlowmeter record){
+        return prFlowmeterMapper.flowmeterAddMonId(record);
+    }
 }

--
Gitblit v1.8.0