From de31eed424e62a219d6378fe193e615a8584ae0c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 14:28:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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..6631459 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,21 +33,20 @@
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;
/**
@@ -66,6 +65,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date createDt;
+ public String isStopped() {
+ if (this.stopped != null) {
+ if(this.stopped == 0){
+ return "鍚�";
+ }else{
+ return "鏄�";
+ }
+ }
+ return "" ;
+ }
+
public String getIsStopped() {
if (this.stopped != null) {
if(this.stopped == 0){
--
Gitblit v1.8.0