hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 04:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yx1101-teacher-l' into dev1107

Browse Source
This commit is contained in:
Wangxxz
2024-12-03 10:10:20 +08:00
parent 963fae8191 aab82de81b
commit 45d38d6df7
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
@@ -153,7 +155,7 @@ public class Teacher extends BaseEntity {
*/
@Column(name = "courses")
private String courses;
/**
* 发薪地id
*/
@@ -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;
}

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

@@ -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 ";
// 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";
hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
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)";
// 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+"%' )";
List<Teacher> teachers=new ArrayList<Teacher>();
try {