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/VoReceipt.java | 123 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java new file mode 100644 index 0000000..ea6ee21 --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java @@ -0,0 +1,123 @@ +package com.dy.pipIrrGlobal.voSe; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson2.writer.ObjectWriterImplToString; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author ZhuBaoMin + * @date 2024-02-01 10:36 + * @LastEditTime 2024-02-01 10:36 + * @Description 鏀舵嵁瑙嗗浘瀵硅薄 + */ + +@Data +public class VoReceipt { + private static final long serialVersionUID = 202402011037001L; + + /** + * 鏀堕摱鍛業D + */ + private String cashierId; + + /** + * 璁㈠崟鍙� + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + private Long orderNumber; + + /** + * 闀囧悕绉� + */ + private String townName; + + /** + * 鏉戝悕绉� + */ + private String villageName; + + /** + * 鍐滄埛濮撳悕 + */ + private String name; + + /** + * 鐢佃瘽 + */ + private String phone; + + /** + * 鍐滄埛缂栧彿 + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + private Long clientNum; + + /** + * 姘村崱缂栧彿 + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + private Long cardNum; + + /** + * 涓氬姟绫诲瀷 + */ + private String operateType; + + /** + * 璐按閲戦 + */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double waterCost; + + /** + * 璧犻�侀噾棰� + */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double gift; + + /** + * 璐崱閲戦 + */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double cardCost; + + /** + * 鏀惰垂閲戦 + */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double amount; + + /** + * 姘村崱浣欓 + */ + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double money; + + /** + * 鏀粯鏂瑰紡 + */ + private String paymentName; + + /** + * 鎿嶄綔浜� + */ + private String operatorName; + + /** + * 鎿嶄綔鏃堕棿 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date operateTime; + + /** + * 褰撳墠鏃堕棿 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date currentTime; +} -- Gitblit v1.8.0