xgxt_sd/zhxg_java
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhy
2025-09-15 22:36:11 +08:00
parent 2c46b27c18 0639027ac0
commit 359d59514d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java
View File

@@ -73,12 +73,12 @@ public class TeacherEvaluationStatus extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private String isScoreImported; private String isScoreImported;
/** 备注 */ // /** 备注 */
@Excel(name = "备注") // @Excel(name = "备注")
private String remarks; private String remarks;
/** 最后更新时间 */ /** 最后更新时间 */
@Excel(name = "最后更新时间") // @Excel(name = "最后更新时间")
private String lastUpdateTime; private String lastUpdateTime;
public Long getId() { public Long getId() {

4
srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml
View File

@@ -62,7 +62,7 @@
<if test="employeeId != null and employeeId != ''"> and t.employee_id like concat('%', #{employeeId}, '%')</if> <if test="employeeId != null and employeeId != ''"> and t.employee_id like concat('%', #{employeeId}, '%')</if>
<if test="stuYearId != null "> and y.id = #{stuYearId}</if> <if test="stuYearId != null "> and y.id = #{stuYearId}</if>
</where> </where>
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> </select>
<select id="selectTeacherEvaluationStatusByCondition" resultMap="TeacherEvaluationStatusResult"> <select id="selectTeacherEvaluationStatusByCondition" resultMap="TeacherEvaluationStatusResult">
@@ -80,7 +80,7 @@
<!-- 查询学院名称列表，用于下拉框 - 只查询学院级别的部门 --> <!-- 查询学院名称列表，用于下拉框 - 只查询学院级别的部门 -->
<select id="selectDeptNameList" resultType="java.util.Map"> <select id="selectDeptNameList" resultType="java.util.Map">
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 from sys_dept d
inner join cph_teacher t on d.dept_id = t.dept_id inner join cph_teacher t on d.dept_id = t.dept_id
where d.del_flag = '0' and d.status = '0' where d.del_flag = '0' and d.status = '0'