From 7690c7e74f3fe109fb31ecde21fb9fc2cc5881ba Mon Sep 17 00:00:00 2001
From: jlt <jltdev@163.com>
Date: Tue, 29 Mar 2022 17:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=9C=B0=E5=88=92=E5=88=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AE=8C=E5=96=84=EF=BC=8C=E8=8F=9C=E5=9B=AD=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=AF=B9=E8=B1=A1=E6=9F=A5=E8=AF=A2=E7=9A=84Mapper?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=8F=9C=E5=9C=B0?=
 =?UTF-8?q?=E5=88=92=E5=88=86=E5=88=97=E8=A1=A8=E4=B8=AD=E7=94=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=9C=B0=E5=90=8D=E7=A7=B0=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?Bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jlt/csa/domain/Garden.java     | 11 +++++++++++
 .../src/main/resources/mapper/csa/GardenMapper.xml   | 12 ++++++++++--
 ruoyi-ui/src/views/csa/garden/index.vue              |  4 +---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/private-farm/src/main/java/com/jlt/csa/domain/Garden.java b/private-farm/src/main/java/com/jlt/csa/domain/Garden.java
index 2abf1e931..255ba1ab7 100644
--- a/private-farm/src/main/java/com/jlt/csa/domain/Garden.java
+++ b/private-farm/src/main/java/com/jlt/csa/domain/Garden.java
@@ -23,6 +23,9 @@ public class Garden extends BaseEntity
     @Excel(name = "农场分区")
     private Long zoneId;
 
+    /** 农场分区对象 */
+    private FarmZone farmZone;
+
     /** 菜地编号 */
     @Excel(name = "菜地编号")
     private String code;
@@ -93,6 +96,14 @@ public class Garden extends BaseEntity
         this.code = code;
     }
 
+    public FarmZone getFarmZone() {
+        return farmZone;
+    }
+
+    public void setFarmZone(FarmZone farmZone) {
+        this.farmZone = farmZone;
+    }
+
     public String getCode()
     {
         return code;
diff --git a/private-farm/src/main/resources/mapper/csa/GardenMapper.xml b/private-farm/src/main/resources/mapper/csa/GardenMapper.xml
index e21aaf700..dddd48ffc 100644
--- a/private-farm/src/main/resources/mapper/csa/GardenMapper.xml
+++ b/private-farm/src/main/resources/mapper/csa/GardenMapper.xml
@@ -26,11 +26,19 @@
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <resultMap id="GardenResultVo" type="Garden" extends="GardenResult">
+        <association property="farmZone" javaType="FarmZone" column="zone_id" select="getFarmZone" />
+    </resultMap>
+
     <sql id="selectGardenVo">
         select id, zone_id, code, name, m2, member_id, manager_id, worker_id, contacter_id, is_farming, is_selled, is_completed, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_garden
     </sql>
 
-    <select id="selectGardenList" parameterType="Garden" resultMap="GardenResult">
+    <select id="getFarmZone" resultMap="com.jlt.csa.mapper.FarmZoneMapper.FarmZoneResult" parameterType="java.lang.Long">
+        select * from csa_farm_zone where id = #{zoneId, jdbcType=INTEGER}
+    </select>
+
+    <select id="selectGardenList" parameterType="Garden" resultMap="GardenResultVo">
         <include refid="selectGardenVo"/>
         <where>
             <if test="zoneId != null "> and zone_id = #{zoneId}</if>
@@ -104,7 +112,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="zoneId != null">zone_id = #{zoneId},</if>
             <if test="code != null and code != ''">code = #{code},</if>
-            <if test="name != null and name != ''">#{name},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
             <if test="m2 != null">m2 = #{m2},</if>
             <if test="memberId != null">member_id = #{memberId},</if>
             <if test="managerId != null">manager_id = #{managerId},</if>
diff --git a/ruoyi-ui/src/views/csa/garden/index.vue b/ruoyi-ui/src/views/csa/garden/index.vue
index 4b0e19923..cb0ffce17 100644
--- a/ruoyi-ui/src/views/csa/garden/index.vue
+++ b/ruoyi-ui/src/views/csa/garden/index.vue
@@ -93,7 +93,7 @@
 
     <el-table v-loading="loading" :data="gardenList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="农场分区" align="center" prop="zoneId" />
+      <el-table-column label="农场分区" align="center" prop="farmZone.name" />
       <el-table-column label="菜地编号" align="center" prop="code">
         <template slot-scope="scope">
           <el-tag
@@ -105,8 +105,6 @@
       </el-table-column>
       <el-table-column label="菜地名称" align="center" prop="name" />
       <el-table-column label="平方米" align="center" prop="m2" />
-      <el-table-column label="会员" align="center" prop="memberId" />
-      <el-table-column label="管理员" align="center" prop="managerId" />
       <el-table-column label="耕作" align="center" prop="isFarming">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isFarming"/>