Merge branch 'yx1101-teacher-l' into dev1107

servers/boe-server-all/src/main/java/com/xboe/module/teacher/entity/Teacher.java

@@ -1,6 +1,8 @@
 package com.xboe.module.teacher.entity;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -209,5 +211,53 @@ public class Teacher extends BaseEntity {
     @Column(name = "user_no",length = 1)
     private Integer userNo;
 
+//    @ApiModelProperty(value = "讲师类型 1 内部讲师  2外部讲师")
+    @Column(name = "teacher_type")
+    private Integer teacherType;
+
+//    @ApiModelProperty(value = "默认授课时长(分钟)")
+    @Column(name = "default_teaching_time")
+    private Integer defaultTeachingTime;
+
+//    @ApiModelProperty(value = "认证人")
+    @Column(name = "certify_by")
+    private String certifyBy;
+
+//    @ApiModelProperty(value = "认证时间")
+    @Column(name = "certify_at")
+    private LocalDateTime certifyAt;
+
+    //    @ApiModelProperty(value = "认证资料路径")
+    @Column(name = "certification")
+    private String certification;
+
+    //   @ApiModelProperty(value = "认证资料路径名称")
+    @Column(name = "certification_name")
+    private String certificationName;
+
+    //    @ApiModelProperty(value = "供应商")
+    @Column(name = "supplier")
+    private String supplier;
+
+
+    //   @ApiModelProperty(value = "教师专长名称 逗号分割")
+    @Column(name = "expertise_names")
+    private String expertiseNames;
+
+    //   @ApiModelProperty(value = "标识 0：自动录入/1：手动录入")
+    @Column(name = "create_from")
+    private Integer createFrom;
+
+    //    @ApiModelProperty(value = "组织id")
+    @Column(name = "org_id")
+    private Long orgId;
+
+    //     @ApiModelProperty(value = "组织名称")
+    @Column(name = "org_name")
+    private String orgName;
+
+    //    @ApiModelProperty(value = "旧系统kid字段")
+    @Column(name = "kid")
+    private String kid;
 
 }

servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java

@@ -100,10 +100,10 @@ public class TeacherServiceImpl implements ITeacherService {
 
     @Override
     public List<Teacher> findByName(String name) {
-//    	String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
+    	String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
-//    	hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
+    	hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
-        String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
+//        String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
-        hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
+//        hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
 
     	List<Teacher> teachers=new ArrayList<Teacher>();
     	try {