From d443f89f684bbf6114127391c7b863ad3790665d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 15:36:02 +0800
Subject: [PATCH] 作物实体增加属性
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 8b0235d..29521b4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -16,7 +16,7 @@
*/
@Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt", "isStopped", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "name", "startDt", "endDt", "stopped", "isStopped", "remarks", "createDt"})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -33,27 +33,26 @@
public String name;
/**
- * 璁$畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁$畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date startDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
- * 璁$畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁$畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date endDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
/**
* 鏄惁鍋滄璁$畻锛�1鏄紝0鍚�
*/
- @JSONField(serialize = false)
public Byte stopped;
/**
* 鏄惁鍋滄璁$畻锛�1鏄紝0鍚�
*/
- public String isStopped;
+ public String stoppedStr;
/**
* 澶囨敞
@@ -65,16 +64,5 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date createDt;
-
- public String getIsStopped() {
- if (this.stopped != null) {
- if(this.stopped == 0){
- return "鍚�";
- }else{
- return "鏄�";
- }
- }
- return "" ;
- }
}
--
Gitblit v1.8.0