diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java index 1dd2aa0..9d5574f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java @@ -73,12 +73,12 @@ public class TeacherEvaluationStatus extends BaseEntity { @TableField(exist = false) private String isScoreImported; - /** 备注 */ - @Excel(name = "备注") +// /** 备注 */ +// @Excel(name = "备注") private String remarks; /** 最后更新时间 */ - @Excel(name = "最后更新时间") +// @Excel(name = "最后更新时间") private String lastUpdateTime; public Long getId() { diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml index c0107f8..37b2ef7 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml @@ -62,7 +62,7 @@ and t.employee_id like concat('%', #{employeeId}, '%') and y.id = #{stuYearId} - order by d.dept_name, t.name, y.stu_year_name desc + order by d.dept_name, t.name, y.stu_year_name desc - select distinct d.dept_id as value, d.dept_name as label + select distinct d.dept_id as value, d.dept_name as label,d.order_num from sys_dept d inner join cph_teacher t on d.dept_id = t.dept_id where d.del_flag = '0' and d.status = '0'