老师学生添加机构字段

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ESettlementFrom.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+public enum ESettlementFrom implements BaseEnum<String, ESettlementFrom> {
+
+    TEACHER("结算给老师"),
+    TENANT("结算给机构"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ESettlementFrom(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Student.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,6 +93,19 @@ public class Student implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+
+    @ApiModelProperty("机构ID ")
+    @TableField(value = "tenant_id_")
+    private Long tenantId;
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public Long getUserId() {
         return userId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
@@ -232,6 +233,31 @@ public class Teacher implements Serializable {
     private Long evaluateTime;
 
 
+    @ApiModelProperty("机构ID ")
+    @TableField(value = "tenant_id_")
+    private Long tenantId;
+
+    @ApiModelProperty("结算方式 TEACHER TENANT ")
+    @TableField(value = "settlement_from_")
+    private ESettlementFrom settlementFrom;
+
+
+    public ESettlementFrom getSettlementFrom() {
+        return settlementFrom;
+    }
+
+    public void setSettlementFrom(ESettlementFrom settlementFrom) {
+        this.settlementFrom = settlementFrom;
+    }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public Long getDefaultSubject() {
         return defaultSubject;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -10,6 +10,7 @@
         <result column="cloud_study_sequence_days_" property="cloudStudySequenceDays"/>
         <result column="cloud_study_use_last_day_" property="cloudStudyUseLastDay"/>
         <result column="lock_flag_" property="lockFlag" />
+        <result column="tenant_id_" property="tenantId" />
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -26,6 +27,7 @@
         , t.cloud_study_use_last_day_ as "cloudStudyUseLastDay"
         , t.train_time_ as trainTime
         , t.evaluate_time_ as evaluateTime
+        , t.tenant_id_ as tenantId
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"
         </sql>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -35,6 +35,8 @@
         <result column="lock_flag_" property="lockFlag" />
         <result column="is_settlement_" property="isSettlement" />
         <result column="is_test_user_" property="isTestUser" />
+        <result column="tenant_id_" property="tenantId" />
+        <result column="settlement_from_" property="settlementFrom" />
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
     </resultMap>
@@ -85,6 +87,8 @@
         , t.update_time_ as "updateTime"
         , t.train_time_ as trainTime
         , t.evaluate_time_ as evaluateTime
+        , t.tenant_id_ as tenantId
+        , t.settlement_from_ as settlementFrom
         </sql>
 
     <!-- 分页查询 -->