From 0cf21592da954beccb0d599bdbc53b38d5129f3c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 24 五月 2024 09:29:19 +0800
Subject: [PATCH] 田间灌溉项目管理 灌溉单元 完善查询接口字段、完善删除接口关联删除
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java | 4 ++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml | 20 ++++++++++++++------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java | 2 +-
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
index a6aaed0..dad0e72 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
@@ -21,7 +21,7 @@
public String projectName;
@Schema(description = "杞亴缁勭紪鐮�")
- private int groupCode;
+ private String groupCode;
@Schema(description = "鐏屾簤鍗曞厓ID")
private String unitId;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
index 446a101..3ff7458 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
@@ -19,7 +19,7 @@
public String projectName;
@Schema(description = "杞亴缁勭紪鐮�")
- private int groupCode;
+ private String groupCode;
@Schema(description = "鐏屾簤鍗曞厓ID")
private String id;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
index 0c9c37a..b0fdd3c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
@@ -110,12 +110,15 @@
CAST(uni.id AS char)AS id,
CAST(uni.operator AS char)AS operator,
cli.name AS operatorName,
+ gru.group_code AS groupCode,
uni.area,
uni.remarks,
uni.operate_time AS operateDt
from ir_irrigate_unit uni
left join ir_project pro on pro.id = uni.project_id
left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
where uni.id = #{id,jdbcType=BIGINT} and uni.deleted = 0
</select>
<!--鍒嗛〉鏌ョ亴婧夊崟鍏�-->
@@ -126,20 +129,23 @@
CAST(uni.id AS char)AS unitId,
CAST(uni.operator AS char)AS operator,
cli.name AS operatorName,
+ gru.group_code AS groupCode,
uni.area,
uni.remarks,
uni.operate_time AS operateDt
FROM ir_irrigate_unit uni
left join ir_project pro on pro.id = uni.project_id
left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
<where>
uni.deleted = 0
<if test="projectName != null and projectName != ''">
AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
</if>
-<!-- <if test = "groupCode != null and groupCode != ''">-->
-<!-- AND pro.project_state = #{groupCode}-->
-<!-- </if>-->
+ <if test = "groupCode != null and groupCode != ''">
+ AND gru.group_code = #{groupCode}
+ </if>
</where>
ORDER BY uni.operate_time DESC
<if test="pageCurr != null and pageSize != null">
@@ -152,14 +158,16 @@
FROM ir_irrigate_unit uni
left join ir_project pro on pro.id = uni.project_id
left join se_client cli on cli.id = uni.operator
+ left join ir_group_unit gu on gu.unit_id = uni.id
+ left join ir_irrigate_group gru on gru.id = gu.group_id
<where>
uni.deleted = 0
<if test="projectName != null and projectName != ''">
AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
</if>
- <!-- <if test = "groupCode != null and groupCode != ''">-->
- <!-- AND pro.project_state = #{groupCode}-->
- <!-- </if>-->
+ <if test = "groupCode != null and groupCode != ''">
+ AND gru.group_code = #{groupCode}
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java
index 620ae40..195f8cb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrIrrigate.irrigateUnit;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoIr.IrGroupUnitMapper;
import com.dy.pipIrrGlobal.daoIr.IrIrrigateUnitMapper;
import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateUnit;
@@ -31,6 +32,8 @@
@Autowired
private IrIrrigateUnitMapper irIrrigateUnitMapper;
+ @Autowired
+ private IrGroupUnitMapper irGroupUnitMapper;
/**
* 鍒涘缓鐏屾簤鍗曞厓
@@ -55,6 +58,7 @@
*/
public Integer deleteUnit(Long id) {
int rows = irIrrigateUnitMapper.deleteLogicById(id);
+ irGroupUnitMapper.deleteByUnitId(id);
if (rows == 0) {
return 0;
}
--
Gitblit v1.8.0