From a1c97fe1dcb26351182aab4e4c43abea96d1f1f2 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 09 七月 2024 15:10:54 +0800
Subject: [PATCH] 灌溉单元新增取水口ID字段，并修改相应的代码和接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
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..e4ef711 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
--
Gitblit v1.8.0