From d21a38bad13d7ca13c85f357e3dd763d5564f332 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 1 Jun 2022 18:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E5=8F=8A=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/worker/domain/WorkerTeam.java    |  4 ++++
 .../src/main/resources/mapper/worker/WorkerMapper.xml  |  2 ++
 .../main/resources/mapper/worker/WorkerTeamMapper.xml  | 10 +++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
index 16a4c4c1..f153611c 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
@@ -25,6 +25,10 @@ public class WorkerTeam extends BaseEntity {
     @Excel(name = "成员师傅备注", cellType = Excel.ColumnType.STRING)
     private String workerName;
 
+    private String name;
 
+    private String phone;
+
+    private String workerLogoUrl;
 
 }
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index 82905ad5..bc6a2132 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -76,6 +76,8 @@
         <set>
             <if test="account != null and account != ''"> account = #{account},</if>
             <if test="phone != null and phone != ''"> phone = #{phone},</if>
+            <if test="leaderTeamRate != null and leaderTeamRate != ''"> leader_team_rate = #{leaderTeamRate},</if>
+            <if test="leaderTeamMoney != null and leaderTeamMoney != ''"> leader_team_money = #{leaderTeamMoney},</if>
         </set>
         where worker_id = #{workerId}
     </update>
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml
index c832bd9f..4b757930 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml
@@ -7,6 +7,9 @@
         <result property="leaderId"         column="leader_id"/>
         <result property="workerId"         column="worker_id"/>
         <result property="workerName"       column="worker_name"/>
+        <result property="name"       column="name"/>
+        <result property="workerLogoUrl"       column="worker_logo_url"/>
+        <result property="phone"       column="phone"/>
         <result property="createBy"         column="create_by"/>
         <result property="createTime"       column="create_time"/>
         <result property="updateBy"         column="update_by"/>
@@ -34,15 +37,16 @@
     </insert>
 
     <sql id="selectWorkerTeam">
-        SELECT *
-        FROM worker_team
+        SELECT wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url
+        FROM worker_team wt
+        left join worker w on wt.worker_id = w.worker_id
     </sql>
 
     <select id="getWorkerTeamList" resultMap="WorkerTeamResult">
         <include refid="selectWorkerTeam"/>
         <where>
             <if test="leaderId != null and leaderId != ''">
-                AND leader_id = #{leaderId}
+                AND wt.leader_id = #{leaderId}
             </if>
         </where>
     </select>