From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段; 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询; 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
index fb636a3..592eed1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
@@ -2,6 +2,7 @@
 
 import com.dy.common.webUtil.QueryConditionVo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ZhuBaoMin
@@ -11,6 +12,7 @@
  */
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class QoWorkOrder extends QueryConditionVo {
     /**
      * 娲惧崟浜哄鍚�
@@ -18,11 +20,26 @@
     private String dispatcher;
 
     /**
+     * 娲惧崟浜篒D
+     */
+    private Long dispatcherId;
+
+    /**
      * 宸℃鍛樺鍚�
      */
     private String inspector;
 
     /**
+     * 宸℃鍛業D
+     */
+    private Long inspectorId;
+
+    /**
+     * 鐘舵�侊細1-鏈畬鎴愶紝2-宸插畬鎴�
+     */
+    private Integer state;
+
+    /**
      * 鏌ヨ寮�濮嬫椂闂�
      */
     private String timeStart;

--
Gitblit v1.8.0