From 12e9ce64c364deb7ea08ba82f8d72abf6e561fc2 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 27 五月 2024 16:53:50 +0800
Subject: [PATCH] 田间灌溉项目管理 灌溉制度模块 修改查询流浪灌溉单元和已绑定灌溉单元接口返回id类型 作物分页查询增加返回备注字段
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index 89a2e92..c8b7ece 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -23,20 +23,30 @@
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
- @Schema(title = "ID")
- @ExcelProperty("ID")
+ @Schema(title = "鍙栨按鍙D")
+ @ExcelProperty("鍙栨按鍙D")
@ColumnWidth(10)
- private Long id;
+ private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
@ExcelProperty("鍙栨按鍙ｅ悕绉�")
@ColumnWidth(15)
private String intakeName;
+ @Schema(title = "鍒嗘按鎴縄D")
+ @ExcelProperty("鍒嗘按鎴縄D")
+ @ColumnWidth(10)
+ private String divideId;
+
@Schema(title = "鎵�灞炲垎姘存埧")
@ExcelProperty("鎵�灞炲垎姘存埧")
@ColumnWidth(15)
private String divideName;
+
+ @Schema(title = "鐗囧尯ID")
+ @ExcelProperty("鐗囧尯ID")
+ @ColumnWidth(15)
+ private String blockId;
@Schema(title = "鎵�灞炵墖鍖�")
@ExcelProperty("鎵�灞炵墖鍖�")
@@ -53,9 +63,39 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "缁忓害")
+ @ExcelProperty("缁忓害")
+ @ColumnWidth(25)
+ private String lng;
+
+ @Schema(title = "绾害")
+ @ExcelProperty("绾害")
+ @ColumnWidth(25)
+ private String lat;
+
+ @Schema(title = "鎿嶄綔浜�")
+ @ExcelProperty("鎿嶄綔浜�")
+ @ColumnWidth(25)
+ private String operator;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鎿嶄綔鏃堕棿")
@ExcelIgnore
private Date operateDt;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(250)
+ private String remarks;
+
+ @Schema(title = "鎺у埗鍣↖D")
+ @ExcelProperty("鎺у埗鍣↖D")
+ @ColumnWidth(15)
+ private String controllerId;
+
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+ @ColumnWidth(15)
+ private String rtuAddr;
}
--
Gitblit v1.8.0