diff --git a/srs-routine/src/main/java/com/srs/routine/domain/dto/StuLeaveApplicationDto.java b/srs-routine/src/main/java/com/srs/routine/domain/dto/StuLeaveApplicationDto.java index a101992..dac93ff 100644 --- a/srs-routine/src/main/java/com/srs/routine/domain/dto/StuLeaveApplicationDto.java +++ b/srs-routine/src/main/java/com/srs/routine/domain/dto/StuLeaveApplicationDto.java @@ -40,9 +40,13 @@ public class StuLeaveApplicationDto extends BaseEntity { @ApiModelProperty("班级id") private String classId; + @ApiModelProperty("班级") + private String className; + @ApiModelProperty("辅导员工号") private String userName; @ApiModelProperty("部门id") private Long deptId; + } diff --git a/srs-routine/src/main/resources/mapper/routine/RtStuLeaveApplicationMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtStuLeaveApplicationMapper.xml index 1e98da2..de78883 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtStuLeaveApplicationMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtStuLeaveApplicationMapper.xml @@ -81,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.leave_status='1' AND a.leave_application_id = #{leaveApplicationId} AND b.stu_no = #{stuNo} - AND a.name = #{name} + AND b.name = #{name} + AND c.class_name = #{className} AND c.class_id = #{classId} AND d.employee_id = #{userName}