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-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
index 5b8ad54..712b0a1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoWorkOrder.java
@@ -17,9 +17,15 @@
*/
@Data
-@JsonPropertyOrder({"dispatcherId", "dispatcher", "inspectorId", "inspector", "taskTypeId", "taskType", "taskContent", "completeCriteria", "deadLine", "dispatchTime", "rejectTimes"})
+@JsonPropertyOrder({"workOrderId", "dispatcherId", "dispatcher", "inspectorId", "inspector", "taskTypeId", "taskType", "taskContent", "completeCriteria", "deadLine", "clientReportId", "inspectorReportId", "completeTime", "dispatchTime", "rejectTimes", "state", "processingState", "proResultId", "proResultStateId"})
public class VoWorkOrder implements BaseEntity {
public static final long serialVersionUID = 202411061524001L;
+
+ /**
+ * 宸ュ崟ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long workOrderId;
/**
* 娲惧崟浜篒D
@@ -71,12 +77,51 @@
private Date deadLine;
/**
+ * 鍐滄埛闂涓婃姤ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long clientReportId;
+
+ /**
+ * 宸℃鍛橀棶棰樹笂鎶D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long inspectorReportId;
+
+ /**
+ * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date completeTime;
+
+ /**
* 娲惧崟鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dispatchTime;
/**
* 椹冲洖娆℃暟
*/
private Integer rejectTimes;
+
+ /**
+ * 宸ュ崟鐘舵��
+ */
+ private String state;
+
+ /**
+ * 澶勭悊鐘舵��
+ */
+ private String processingState;
+
+ /**
+ * 澶勭悊缁撴灉ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long proResultId;
+ /**
+ * 澶勭悊缁撴灉鐘舵�乮d
+ */
+ private Integer proResultStateId;
}
--
Gitblit v1.8.0