From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransaction.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransaction.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransaction.java
new file mode 100644
index 0000000..44a542a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransaction.java
@@ -0,0 +1,75 @@
+package com.dy.pipIrrGlobal.voSe;
+
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2023-12-26 20:44
+ * @LastEditTime 2023-12-26 20:44
+ * @Description
+ */
+
+@Data
+@Schema(title = "浜ゆ槗璁板綍瑙嗗浘瀵硅薄")
+public class VoTransaction implements BaseEntity {
+ private static final long serialVersionUID = 202401241705001L;
+
+ @Schema(title = "璁㈠崟缂栧彿")
+ private Long orderNumber;
+
+ @Schema(title = "鏉戝簞ID")
+ private Long villageId;
+
+ @Schema(title = "鏉戝簞")
+ private String districtTitle;
+
+ @Schema(title = "鍐滄埛缂栧彿")
+ private String clientNum;
+
+ @Schema(title = "濮撳悕")
+ private String name;
+
+ @Schema(title = "姘村崱缂栧彿")
+ private Long cardNum;
+
+ @Schema(title = "韬唤璇佸彿")
+ private String idCard;
+
+ @Schema(title = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @Schema(title = "涓氬姟绫诲瀷")
+ private String operateType;
+
+ @Schema(title = "浜ゆ槗鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operateTime;
+
+ @Schema(title = "浣欓")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float money;
+
+ @Schema(title = "璐按閲戦")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float waterCost;
+
+ @Schema(title = "璧犻�侀噾棰�")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float gift;
+
+ @Schema(title = "璐崱閲戦")
+ private Integer cardCost;
+
+ @Schema(title = "鏀粯鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(title = "鎿嶄綔鍛�")
+ private String operatorName;
+}
--
Gitblit v1.8.0