From 98bc598067f756be7935c7647114ebc1ed5c2cbd Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Wed, 27 Apr 2022 16:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E7=AB=AF=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=B8=88=E5=82=85=E5=9B=A2=E9=98=9F=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/customer/domain/Customer.java     |  2 +-
 .../java/com/ghy/worker/domain/Worker.java    | 30 +++++++++++++++++++
 .../com/ghy/worker/domain/WorkerTeam.java     | 30 +++++++++++++++++++
 .../resources/mapper.worker/WorkerMapper.xml  |  2 +-
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java

diff --git a/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java b/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
index 2be64a27..b6d2b77b 100644
--- a/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
+++ b/ghy-custom/src/main/java/com/ghy/customer/domain/Customer.java
@@ -19,7 +19,7 @@ public class Customer extends BaseEntity {
     @Excel(name = "用户名", cellType = Excel.ColumnType.STRING)
     private String name;
 
-    @Excel(name = "用户微信账号", cellType = Excel.ColumnType.STRING)
+    @Excel(name = "用户账号", cellType = Excel.ColumnType.STRING)
     private String account;
 
     @Excel(name = "用户手机号", cellType = Excel.ColumnType.STRING)
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index a945a42e..a8e66696 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -1,13 +1,43 @@
 package com.ghy.worker.domain;
 
+import com.ghy.common.annotation.Excel;
 import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
 
 /**
  * @author clunt
  * 师傅实体
  */
+@Data
 public class Worker extends BaseEntity {
 
+    private static final long serialVersionUID = 1L;
 
+    @Excel(name = "师傅id", cellType = Excel.ColumnType.NUMERIC)
+    private Long workerId;
+
+    @Excel(name = "师傅名字", cellType = Excel.ColumnType.STRING)
+    private String name;
+
+    @Excel(name = "师傅账号", cellType = Excel.ColumnType.STRING)
+    private String account;
+
+    @Excel(name = "师傅手机号", cellType = Excel.ColumnType.STRING)
+    private String phone;
+
+    @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING)
+    private String openId;
+
+    @Excel(name = "用户状态 0生效 1冻结 2删除", readConverterExp = "0=生效,1=冻结,2=删除")
+    private Integer status;
+
+    @Excel(name = "用户头像", cellType = Excel.ColumnType.STRING)
+    private String workerLogoUrl;
+
+    @Excel(name = "领导团队扣点", cellType = Excel.ColumnType.STRING)
+    private String leaderTeamRate;
+
+    @Excel(name = "领导团队扣费金额", cellType = Excel.ColumnType.STRING)
+    private String leaderTeamMoney;
 
 }
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
new file mode 100644
index 00000000..16a4c4c1
--- /dev/null
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java
@@ -0,0 +1,30 @@
+package com.ghy.worker.domain;
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author clunt
+ * 师傅团队
+ */
+@Data
+public class WorkerTeam extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "师傅团队id", cellType = Excel.ColumnType.NUMERIC)
+    private Long workerTeamId;
+
+    @Excel(name = "团队归属师傅id", cellType = Excel.ColumnType.NUMERIC)
+    private Long leaderId;
+
+    @Excel(name = "团队成员师傅id", cellType = Excel.ColumnType.NUMERIC)
+    private Long workerId;
+
+    @Excel(name = "成员师傅备注", cellType = Excel.ColumnType.STRING)
+    private String workerName;
+
+
+
+}
diff --git a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
index 9ec94a9b..44a41e35 100644
--- a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml
@@ -11,7 +11,7 @@
         <result property="remark"              column="remark"        />
     </resultMap>
 
-    <sql id="selectCustomerPlace">
+    <sql id="selectWorker">
 
     </sql>