From e706b848e0a32628e869b312bb5d1557d0030dcc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 10 七月 2024 18:07:31 +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/voIr/VoUnitOne.java | 6 ++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml | 19 ++++++++++++++++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java | 6 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java | 7 +++++++
4 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java
index 6f49902..6c4d038 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java
@@ -47,6 +47,13 @@
@Schema(description = "椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "椤圭洰ID涓嶈兘涓虹┖")
private Long projectId;
+
+ /**
+ * 鍙栨按鍙D
+ */
+ @Schema(description = "鍙栨按鍙D", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long intakeId;
+
/**
* 鐏屾簤闈㈢Н
*/
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 b09d4f5..0d82a29 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
@@ -49,4 +49,10 @@
*/
@Schema(description = "鎿嶄綔鏃堕棿")
private Date operateDt;
+
+ @Schema(description = "鍙栨按鍙d")
+ public String intakeId;
+
+ @Schema(description = "鍙栨按鍙ｅ悕绉�")
+ public String intakeName;
}
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 426727f..57f6397 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
@@ -47,4 +47,10 @@
*/
@Schema(description = "鎿嶄綔鏃堕棿")
private Date operateDt;
+
+ @Schema(description = "鍙栨按鍙d")
+ public String intakeId;
+
+ @Schema(description = "鍙栨按鍙ｅ悕绉�")
+ public String intakeName;
}
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 b0fdd3c..600d56d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
@@ -6,6 +6,7 @@
<!--@Table ir_irrigate_unit-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="project_id" jdbcType="BIGINT" property="projectId" />
+ <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="area" jdbcType="FLOAT" property="area" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
@@ -14,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, project_id, area, remarks, `operator`,
+ id, project_id,intake_id, area, remarks, `operator`,
operate_time, deleted
</sql>
@@ -28,6 +29,9 @@
</if>
<if test="projectId != null">
project_id,
+ </if>
+ <if test="intakeId != null">
+ intake_id,
</if>
<if test="area != null">
area,
@@ -51,6 +55,9 @@
</if>
<if test="projectId != null">
#{projectId,jdbcType=BIGINT},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
</if>
<if test="area != null">
#{area,jdbcType=FLOAT},
@@ -84,6 +91,9 @@
<if test="projectId != null">
project_id = #{projectId,jdbcType=BIGINT},
</if>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
<if test="area != null">
area = #{area,jdbcType=FLOAT},
</if>
@@ -107,6 +117,8 @@
select
CAST(pro.id AS char)AS projectId,
pro.project_name AS projectName,
+ CAST(intake.id AS char)AS intakeId,
+ intake.name AS intakeName,
CAST(uni.id AS char)AS id,
CAST(uni.operator AS char)AS operator,
cli.name AS operatorName,
@@ -115,6 +127,7 @@
uni.remarks,
uni.operate_time AS operateDt
from ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
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
@@ -126,6 +139,8 @@
SELECT
CAST(pro.id AS char)AS projectId,
pro.project_name AS projectName,
+ CAST(intake.id AS char)AS intakeId,
+ intake.name AS intakeName,
CAST(uni.id AS char)AS unitId,
CAST(uni.operator AS char)AS operator,
cli.name AS operatorName,
@@ -134,6 +149,7 @@
uni.remarks,
uni.operate_time AS operateDt
FROM ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
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
@@ -156,6 +172,7 @@
<select id="getRecordCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
FROM ir_irrigate_unit uni
+ left join pr_intake intake on intake.id = uni.intake_id
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
--
Gitblit v1.8.0