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 @@ account = #{account}, phone = #{phone}, + leader_team_rate = #{leaderTeamRate}, + leader_team_money = #{leaderTeamMoney}, where worker_id = #{workerId} 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 @@ + + + @@ -34,15 +37,16 @@ - 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