From 8dcdba2f833fa7dd79169a068ce8b45d380d58a0 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 14 七月 2025 13:43:51 +0800 Subject: [PATCH] 修改用水户年用水量统计查询中的bug --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java index 323e0b1..9cd3273 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java @@ -2,12 +2,10 @@ public class CodeV202404 { //鍔熻兘鐮佷负瀛楃涓诧紝鍗佸叚杩涘埗鏁版嵁 - public static final String cd_02 = "02" ;//閾捐矾妫�娴� + public static final String cd_02 = "02" ;//閾捐矾妫�娴� 涓诲姩涓婃姤 public static final String cd_10 = "10" ;//璁剧疆璁惧缁堢鍦板潃 public static final String cd_8A = "8A" ;//璁惧鐧诲綍 public static final String cd_50 = "50" ; //鏌ヨ璁惧缁堢鍦板潃 - public static final String cd_80 = "80" ; //璁惧缁堢宸ヤ綔涓婃姤 - public static final String cd_81 = "81" ; //璁惧缁堢闅忔満鑷姤 public static final String cd_5B = "5B" ; //鏌ヨ璁惧缁堢瀹炴椂鍊� public static final String cd_65 = "65" ; //鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍 public static final String cd_97 = "97" ; //娓呴櫎璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍 @@ -26,9 +24,11 @@ public static final String cd_93 = "93" ; //骞冲彴杩滅▼鍏抽棴姘存车/闃�闂� public static final String cd_A2 = "A2" ; //APP杩滅▼寮�鍚按娉�/闃�闂� public static final String cd_A3 = "A3" ; //APP杩滅▼鍏抽棴姘存车/闃�闂� - public static final String cd_83 = "83" ; //閬ユ祴缁堢瀹氱偣涓婃姤 - public static final String cd_84 = "84" ; //鍒峰崱寮�娉�/闃�涓婃姤 - public static final String cd_85 = "85" ; //鍒峰崱鍏虫车/闃�涓婃姤 + public static final String cd_80 = "80" ; //璁惧缁堢宸ヤ綔涓婃姤 涓诲姩涓婃姤 + public static final String cd_81 = "81" ; //璁惧缁堢闅忔満鑷姤 涓诲姩涓婃姤 + public static final String cd_83 = "83" ; //閬ユ祴缁堢瀹氱偣涓婃姤锛堜竴澶╂姤涓�娆★級 涓诲姩涓婃姤 + public static final String cd_84 = "84" ; //鍒峰崱寮�娉�/闃�涓婃姤 涓诲姩涓婃姤 + public static final String cd_85 = "85" ; //鍒峰崱鍏虫车/闃�涓婃姤 涓诲姩涓婃姤 public static final String cd_9A = "9A" ; //鏌ヨ骞寸敤姘撮噺 public static final String cd_26 = "26" ; //璁剧疆璁惧缁堢骞寸敤姘撮噺 public static final String cd_21 = "21" ; //璁剧疆璁惧缁堢IP鍦板潃 @@ -41,6 +41,12 @@ public static final String cd_9B = "9B" ; //娓呴櫎璁惧缁堢娉ㄥ唽鍙� public static final String cd_9C = "9C" ; //榛戝悕鍗曡繙绋嬪己鍒跺叧闂按娉�/闃�闂� public static final String cd_C2 = "C2" ; //寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤 + public static final String cd_9D = "9D" ; //姝e父杩滅▼鍏抽棴姘存车/闃�闂� + + public static final String cd_35 = "35" ; //APP绔繙绋嬪畾鏃跺紑鍚按娉�/闃�闂� + public static final String cd_36 = "36" ; //APP绔繙绋嬪畾閲忓紑鍚按娉�/闃�闂� + public static final String cd_37 = "37" ; //APP绔鍒掕繙绋嬪畾鏃跺紑鍚按娉�/闃�闂� + public static final String cd_38 = "38" ; //APP绔繙绋嬭鍒掑畾閲忓紑鍚按娉�/闃�闂� public static final String cd_1600 = "1600" ;//鍗囩骇澶嶄綅 public static final String cd_1601 = "1601" ;//鍗囩骇閰嶇疆 @@ -90,6 +96,13 @@ (code.equals(cd_9B) ? "娓呴櫎璁惧缁堢娉ㄥ唽鍙�" : (code.equals(cd_9C) ? "榛戝悕鍗曡繙绋嬪己鍒跺叧闂按娉�/闃�闂�" : (code.equals(cd_C2) ? "寮�鍏虫按娉�/闃�闂ㄧ粨鏋滀笂鎶�" : + (code.equals(cd_9D) ? "姝e父杩滅▼鍏抽棴姘存车/闃�闂�" : + + (code.equals(cd_35) ? "APP绔繙绋嬪畾鏃跺紑鍚按娉�/闃�闂�" : + (code.equals(cd_36) ? "APP绔繙绋嬪畾閲忓紑鍚按娉�/闃�闂�" : + (code.equals(cd_37) ? "APP绔鍒掕繙绋嬪畾鏃跺紑鍚按娉�/闃�闂�" : + (code.equals(cd_38) ? "APP绔繙绋嬭鍒掑畾閲忓紑鍚按娉�/闃�闂�" : + (code.equals(cd_1600) ? "鍗囩骇澶嶄綅" : (code.equals(cd_1601) ? "鍗囩骇閰嶇疆" : (code.equals(cd_1602) ? "鍗囩骇鏁版嵁" : @@ -97,7 +110,7 @@ (code.equals(cd_9601) ? "鍗囩骇閰嶇疆" : (code.equals(cd_9602) ? "鍗囩骇鏁版嵁" : (code.equals(cd_9603) ? "鍗囩骇鏍¢獙" : - "")))))))))))))))))))))))))))))))))))))))))))))) ; + ""))))))))))))))))))))))))))))))))))))))))))))))))))) ; if(name == null || name.equals("")){ name = code ; } -- Gitblit v1.8.0