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/voIr/VoCrop.java | 3 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml | 3 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 16 ++++++++--------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
index c48b790..1772e71 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
@@ -19,4 +19,7 @@
@Schema(description = "浣滅墿鍚嶇О")
private String cropName;
+
+ @Schema(description = "澶囨敞")
+ private String remarks;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
index fb1c0b8..da5e8f4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
@@ -84,7 +84,8 @@
<select id="getCrops" resultType="com.dy.pipIrrGlobal.voIr.VoCrop">
SELECT
CAST(cro.id AS char)AS id,
- cro.crop_name AS cropName
+ cro.crop_name AS cropName,
+ cro.remarks
FROM ir_crop cro
<where>
cro.deleted = 0
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index 6a6ce00..7694fbb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -319,15 +319,15 @@
@GetMapping(path = "bind_units")
@SsoAop()
- public BaseResponse<Map> getGroupBindUnits(Long id) {
+ public BaseResponse<List<String>> getGroupBindUnits(Long id) {
try {
List<Long> res = irrigateGroupSv.getGroupBindUnits(id);
- HashMap<Integer, String> map = new HashMap<>();
+ ArrayList<Object> list = new ArrayList<>();
for (int i = 0; i < res.size(); i++) {
String aLong = res.get(i).toString();
- map.put(i,aLong);
+ list.add(aLong);
}
- return BaseResponseUtils.buildSuccess(map);
+ return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鑾峰彇涓�涓疆鐏岀粍缁戝畾鐏屾簤鍗曞厓璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -336,15 +336,15 @@
@GetMapping(path = "notBind_units")
@SsoAop()
- public BaseResponse<Map> getNotBindUnits() {
+ public BaseResponse<List<String>> getNotBindUnits() {
try {
List<Long> res = irrigateGroupSv.getNotBindUnits();
- HashMap<Integer, String> map = new HashMap<>();
+ ArrayList<Object> list = new ArrayList<>();
for (int i = 0; i < res.size(); i++) {
String aLong = res.get(i).toString();
- map.put(i,aLong);
+ list.add(aLong);
}
- return BaseResponseUtils.buildSuccess(map);
+ return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鑾峰彇鏈粦瀹氳疆鐏岀粍鐨勭亴婧夊崟鍏僫d璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
--
Gitblit v1.8.0