From 04821fd724cc279ae6d41f968f79c767cfd9233e Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 12 九月 2024 17:17:55 +0800
Subject: [PATCH] 优化代码 指定时间段内开阀次数高于指定值的农户        指定时间段内开阀次数低于指定值的农户

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 25c88b2..1042061 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -51,13 +51,24 @@
     @ColumnWidth(30)
     private Date findDt;
 
+//    @Schema(title = "鍦ㄧ嚎鐘舵��")
+//    @ExcelProperty("鍦ㄧ嚎鐘舵��")
+//    @ColumnWidth(6)
+//    private String onlineState;
+
     /**
-     * 鍦ㄧ嚎鐘舵��;1-鍦ㄧ嚎锛�2-绂荤嚎
+     * 鏄惁鍦ㄧ嚎
      */
-    @Schema(description = "鍦ㄧ嚎鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @ExcelProperty("鍦ㄧ嚎鐘舵��")
-    @ColumnWidth(1)
-    @Max(message = "鍦ㄧ嚎鐘舵�佸彧鑳�1鎴�2", value = 2)
-    @Min(message = "鍦ㄧ嚎鐘舵�佸彧鑳�1鎴�2",value = 1)
-    private byte onlineState;
+    private Boolean isOnLine;
+
+
+    @Schema(title = "閫氳鍗忚")
+    @ExcelProperty("閫氳鍗忚")
+    @ColumnWidth(10)
+    private String protocol;
+
+    @Schema(title = "澶囨敞")
+    @ExcelProperty("澶囨敞")
+    @ColumnWidth(10)
+    private String remarks;
 }

--
Gitblit v1.8.0