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/VoActiveCard.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
index 17f3535..677dc81 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -21,6 +23,7 @@
private static final long serialVersionUID = 1L;
@Schema(title = "ID")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long id;
@Schema(title = "鍐滄埛濮撳悕")
@@ -42,10 +45,16 @@
private Integer cardCost;
@Schema(title = "琛ュ崱閲戦")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double reissueAmount;
- @Schema(title = "鏀粯鏂瑰紡")
- private Integer paymentId;
+ //@Schema(title = "鏀粯鏂瑰紡")
+ //@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ //private Long paymentId;
+ /**
+ * 鏀粯鏂瑰紡鍚嶇О
+ */
+ private String paymentName;
@Schema(title = "鎿嶄綔浜�")
private String operator;
--
Gitblit v1.8.0