From b625c2ccaa9c22b5f6837f1b43bec40b6f308121 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 11:32:31 +0800
Subject: [PATCH] 修改bug

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java |   70 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index fa96fca..30360d9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -283,7 +283,7 @@
         List<VoCountOfOpenType> list = rmOpenCloseValveLastMapper.getCountByOpenType(params) ;
         if(list != null){
             for (VoCountOfOpenType vo : list) {
-                if (vo.openType == null){
+                if (vo.openType != null){
                     switch (vo.openType) {
                         case 1:
                             vo.openTypeName = "鍒峰崱寮�闃�";
@@ -322,39 +322,41 @@
         List<VoCountOfCloseType> list = rmOpenCloseValveLastMapper.getCountByCloseType(params) ;
         if(list != null) {
             for (VoCountOfCloseType vo : list) {
-                switch (vo.closeType) {
-                    case 2:
-                        vo.closeTypeName = "鍒峰崱鍏抽榾";
-                        break;
-                    case 4:
-                        vo.closeTypeName = "涓績绔欏叧闃�";
-                        break;
-                    case 5:
-                        vo.closeTypeName = "娆犺垂鍏抽榾";
-                        break;
-                    case 6:
-                        vo.closeTypeName = "娴侀噺璁℃晠闅滃叧闃�";
-                        break;
-                    case 7:
-                        vo.closeTypeName = "绱ф�ュ叧闃�";
-                        break;
-                    case 9:
-                        vo.closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
-                        break;
-                    case 10:
-                        vo.closeTypeName = "宸℃鍗″叧闃�";
-                        break;
-                    case 12:
-                        vo.closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
-                        break;
-                    case 13:
-                        vo.closeTypeName = "杩滅▼瀹氭椂鍏抽榾";
-                        break;
-                    case 14:
-                        vo.closeTypeName = "杩滅▼瀹氶噺鍏抽榾";
-                        break;
-                    default:
-                        vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
+                if (vo.closeType != null) {
+                    switch (vo.closeType) {
+                        case 2:
+                            vo.closeTypeName = "鍒峰崱鍏抽榾";
+                            break;
+                        case 4:
+                            vo.closeTypeName = "涓績绔欏叧闃�";
+                            break;
+                        case 5:
+                            vo.closeTypeName = "娆犺垂鍏抽榾";
+                            break;
+                        case 6:
+                            vo.closeTypeName = "娴侀噺璁℃晠闅滃叧闃�";
+                            break;
+                        case 7:
+                            vo.closeTypeName = "绱ф�ュ叧闃�";
+                            break;
+                        case 9:
+                            vo.closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
+                            break;
+                        case 10:
+                            vo.closeTypeName = "宸℃鍗″叧闃�";
+                            break;
+                        case 12:
+                            vo.closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
+                            break;
+                        case 13:
+                            vo.closeTypeName = "杩滅▼瀹氭椂鍏抽榾";
+                            break;
+                        case 14:
+                            vo.closeTypeName = "杩滅▼瀹氶噺鍏抽榾";
+                            break;
+                        default:
+                            vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
+                    }
                 }
             }
         }

--
Gitblit v1.8.0