diff --git a/bin/run.bat b/bin/run.bat
index 99e3538..3b8ceb3 100644
--- a/bin/run.bat
+++ b/bin/run.bat
@@ -8,7 +8,8 @@ cd ../srs-admin/target
 
 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
-java -jar %JAVA_OPTS% srs-admin.jar
+rem 正确传递 JVM 参数应放在 -jar 之前
+java %JAVA_OPTS% -jar srs-admin.jar
 
 cd bin
-pause
\ No newline at end of file
+pause
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java
new file mode 100644
index 0000000..a04e9bc
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsAccommodations.java
@@ -0,0 +1,368 @@
+package com.srs.dormitory.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 外宿申请对象 dms_accommodations
+ *
+ * @author srs
+ * @date 2025-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsAccommodations对象" , description = "外宿申请表")
+@TableName("dms_accommodations")
+public class DmsAccommodations extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * #
+     */
+    @ApiModelProperty("#")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @TableField("stu_no")
+    @Excel(name = "学号")
+    private String stuNo;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    @TableField("stu_name")
+    @Excel(name = "姓名")
+    private String stuName;
+
+    /**
+     * 出生日期
+     */
+    @ApiModelProperty("出生日期")
+    @TableField("birthday")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    @TableField("gender")
+    @Excel(name = "性别")
+    private String gender;
+
+    /**
+     * 班级
+     */
+    @ApiModelProperty("班级")
+    @TableField("class_name")
+    @Excel(name = "班级")
+    private String className;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    @TableField("stu_phone")
+    @Excel(name = "联系电话")
+    private String stuPhone;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    @TableField("sfzh")
+    @Excel(name = "身份证号")
+    private String sfzh;
+
+    /**
+     * 学院
+     */
+    @ApiModelProperty("学院")
+    @TableField("dept_name")
+    @Excel(name = "学院")
+    private String deptName;
+
+    /**
+     * 专业
+     */
+    @ApiModelProperty("专业")
+    @TableField("major_name")
+    @Excel(name = "专业")
+    private String majorName;
+
+    /**
+     * 年级
+     */
+    @ApiModelProperty("年级")
+    @TableField("grade_name")
+    @Excel(name = "年级")
+    private String gradeName;
+
+    /**
+     * 房间号
+     */
+    @ApiModelProperty("房间号")
+    @TableField("room_no")
+    @Excel(name = "房间号")
+    private String roomNo;
+
+    /**
+     * 宿舍缴费情况
+     */
+    @ApiModelProperty("宿舍缴费情况")
+    @TableField("isCharge")
+    @Excel(name = "宿舍缴费情况")
+    private Long isCharge;
+
+    /**
+     * 外宿原因
+     */
+    @ApiModelProperty("外宿原因")
+    @TableField("sleep_out_remark")
+    @Excel(name = "外宿原因")
+    private String sleepOutRemark;
+
+    /**
+     * 外宿地址
+     */
+    @ApiModelProperty("外宿地址")
+    @TableField("address")
+    @Excel(name = "外宿地址")
+    private String address;
+
+    /**
+     * 紧急联系人
+     */
+    @ApiModelProperty("紧急联系人")
+    @TableField("emergency_contact")
+    @Excel(name = "紧急联系人")
+    private String emergencyContact;
+
+    /**
+     * 家长意见
+     */
+    @ApiModelProperty("家长意见")
+    @TableField("parent_comment")
+    @Excel(name = "家长意见")
+    private String parentComment;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty("家长联系电话")
+    @TableField("parent_tel")
+    @Excel(name = "家长联系电话")
+    private String parentTel;
+
+    /**
+     * 家长联系地址
+     */
+    @ApiModelProperty("家长联系地址")
+    @TableField("parent_address")
+    @Excel(name = "家长联系地址")
+    private String parentAddress;
+
+    /**
+     * 状态（0：保存；1：待审核；2：已审核)
+     */
+    @ApiModelProperty("状态（0：保存；1：待审核；2：已审核)")
+    @TableField("reviewer_status")
+    @Excel(name = "状态" , readConverterExp = "状态（0：保存；1：待审核；2：已审核)")
+    private Long reviewerStatus;
+
+    /**
+     * 申请人签名
+     */
+    @ApiModelProperty("申请人签名")
+    @TableField("apply_sign")
+    @Excel(name = "申请人签名")
+    private String applySign;
+
+    /**
+     * 申请日期
+     */
+    @ApiModelProperty("申请日期")
+    @TableField("apply_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
+    /**
+     * 申请人签名
+     */
+    @ApiModelProperty("申请人签名")
+    @TableField("apply_sign")
+    @Excel(name = "申请人签名")
+    private String applySign2;
+
+    /**
+     * 申请日期
+     */
+    @ApiModelProperty("申请日期")
+    @TableField("apply_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate2;
+
+    /**
+     * 辅导员意见
+     */
+    @ApiModelProperty("辅导员意见")
+    @TableField("fdy_cmt")
+    @Excel(name = "辅导员意见")
+    private String fdyCmt;
+
+    /**
+     * 辅导员签名
+     */
+    @ApiModelProperty("辅导员签名")
+    @TableField("fdy_sign")
+    @Excel(name = "辅导员签名")
+    private String fdySign;
+
+    /**
+     * 辅导员审核日期
+     */
+    @ApiModelProperty("辅导员审核日期")
+    @TableField("fdy_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "辅导员审核日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fdyDate;
+
+    /**
+     * 辅导员工号
+     */
+    @ApiModelProperty("辅导员工号")
+    @TableField("fdy_no")
+    @Excel(name = "辅导员工号")
+    private String fdyNo;
+
+    /**
+     * 二级学院审核意见
+     */
+    @ApiModelProperty("二级学院审核意见")
+    @TableField("dept_cmt")
+    @Excel(name = "二级学院审核意见")
+    private String deptCmt;
+
+    /**
+     * 二级学院签名（公章）
+     */
+    @ApiModelProperty("二级学院签名（公章）")
+    @TableField("dept_sign")
+    @Excel(name = "二级学院签名" , readConverterExp = "公=章")
+    private String deptSign;
+
+    /**
+     * 二级学院审核日期
+     */
+    @ApiModelProperty("二级学院审核日期")
+    @TableField("dept_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "二级学院审核日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptDate;
+
+    /**
+     * 二级学院审核工号
+     */
+    @ApiModelProperty("二级学院审核工号")
+    @TableField("dept_no")
+    @Excel(name = "二级学院审核工号")
+    private String deptNo;
+
+    /**
+     * 学工意见
+     */
+    @ApiModelProperty("学工意见")
+    @TableField("xg_cmt")
+    @Excel(name = "学工意见")
+    private String xgCmt;
+
+    /**
+     * 学工签名
+     */
+    @ApiModelProperty("学工签名")
+    @TableField("xg_sign")
+    @Excel(name = "学工签名")
+    private String xgSign;
+
+    /**
+     * 学工审核日期
+     */
+    @ApiModelProperty("学工审核日期")
+    @TableField("xg_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "学工审核日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xgDate;
+
+    /**
+     * 学工审核工号
+     */
+    @ApiModelProperty("学工审核工号")
+    @TableField("xg_no")
+    @Excel(name = "学工审核工号")
+    private String xgNo;
+
+    /**
+     * 校领导意见
+     */
+    @ApiModelProperty("校领导意见")
+    @TableField("leader_cmt")
+    @Excel(name = "校领导意见")
+    private String leaderCmt;
+
+    /**
+     * 校领导
+     */
+    @ApiModelProperty("校领导")
+    @TableField("leader_sign")
+    @Excel(name = "校领导")
+    private String leaderSign;
+
+    /**
+     * 校领导审核日期
+     */
+    @ApiModelProperty("校领导审核日期")
+    @TableField("leader_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "校领导审核日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date leaderDate;
+
+    /**
+     * 校领导审核工号
+     */
+    @ApiModelProperty("校领导审核工号")
+    @TableField("leader_no")
+    @Excel(name = "校领导审核工号")
+    private String leaderNo;
+
+    @ApiModelProperty("园区")
+    @TableField(exist = false)
+    private  String Name;
+
+    @ApiModelProperty("签名")
+    @TableField(exist = false)
+    private  String signature;
+
+    @ApiModelProperty("学年")
+    @TableField("stu_year_name")
+    @Excel(name = "学年")
+    private  String stuYearName;
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java
new file mode 100644
index 0000000..2c5a4fe
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java
@@ -0,0 +1,361 @@
+package com.srs.dormitory.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+/**
+ * 外宿申请对象 dms_outside_accommodation_apply
+ *
+ * @author srs
+ * @date 2025-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsOutsideAccommodationApply对象", description = "外宿申请表")
+@TableName("dms_outside_accommodation_apply")
+public class DmsOutsideAccommodationApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申请编号（唯一，如WS20240001）
+     */
+    @ApiModelProperty("申请编号（唯一，如WS20240001）")
+    @TableField("apply_no")
+    @Excel(name = "申请编号", readConverterExp = "唯=一，如WS20240001")
+    private String applyNo;
+
+    /**
+     * 学生ID（关联学生表）
+     */
+    @ApiModelProperty("学生ID（关联学生表）")
+    @TableField("student_id")
+    @Excel(name = "学生ID", readConverterExp = "关=联学生表")
+    private Long studentId;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @TableField("student_no")
+    @Excel(name = "学号")
+    private String studentNo;
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    @TableField("student_name")
+    @Excel(name = "学生姓名")
+    private String studentName;
+
+    /**
+     * 性别（男/女）
+     */
+    @ApiModelProperty("性别（男/女）")
+    @TableField("gender")
+    @Excel(name = "性别", readConverterExp = "男=/女")
+    private String gender;
+
+    /**
+     * 出生年月
+     */
+    @ApiModelProperty("出生年月")
+    @TableField("birth_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate;
+
+    /**
+     * 学院ID
+     */
+    @ApiModelProperty("学院ID")
+    @TableField("dept_id")
+    @Excel(name = "学院ID")
+    private Long deptId;
+
+    /**
+     * 学院名称
+     */
+    @ApiModelProperty("学院名称")
+    @TableField("dept_name")
+    @Excel(name = "学院名称")
+    private String deptName;
+
+    /**
+     * 专业ID
+     */
+    @ApiModelProperty("专业ID")
+    @TableField("major_id")
+    @Excel(name = "专业ID")
+    private Long majorId;
+
+    /**
+     * 专业名称
+     */
+    @ApiModelProperty("专业名称")
+    @TableField("major_name")
+    @Excel(name = "专业名称")
+    private String majorName;
+
+    /**
+     * 班级ID
+     */
+    @ApiModelProperty("班级ID")
+    @TableField("class_id")
+    @Excel(name = "班级ID")
+    private Long classId;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    @TableField("class_name")
+    @Excel(name = "班级名称")
+    private String className;
+
+    /**
+     * 原宿舍号（如：1栋302）
+     */
+    @ApiModelProperty("原宿舍号（如：1栋302）")
+    @TableField("original_dormitory")
+    @Excel(name = "原宿舍号", readConverterExp = "如=：1栋302")
+    private String originalDormitory;
+
+    /**
+     * 住宿费缴纳
+     */
+    @ApiModelProperty("住宿费缴纳")
+    @TableField("accommodation_fee")
+    @Excel(name = "住宿费缴纳")
+    private String accommodationFee;
+
+    /**
+     * 住宿费缴纳状态（1=已交，0=未交）
+     */
+    @ApiModelProperty("住宿费缴纳状态（1=已交，0=未交）")
+    @TableField("accommodation_fee_status")
+    @Excel(name = "住宿费缴纳状态", readConverterExp = "1==已交，0=未交")
+    private Long accommodationFeeStatus;
+
+    /**
+     * 外宿原因
+     */
+    @ApiModelProperty("外宿原因")
+    @TableField("apply_reason")
+    @Excel(name = "外宿原因")
+    private String applyReason;
+
+    /**
+     * 外宿详细地址（精确至门牌号）
+     */
+    @ApiModelProperty("外宿详细地址（精确至门牌号）")
+    @TableField("outside_address")
+    @Excel(name = "外宿详细地址", readConverterExp = "精=确至门牌号")
+    private String outsideAddress;
+
+    /**
+     * 外宿地址-省市区/县
+     */
+    @ApiModelProperty("外宿地址-省市区/县")
+    @TableField("address")
+    @Excel(name = "外宿地址-省市区/县")
+    private String address;
+
+    /**
+     * 紧急联系人电话
+     */
+    @ApiModelProperty("紧急联系人电话")
+    @TableField("emergency_phone")
+    @Excel(name = "紧急联系人电话")
+    private String emergencyPhone;
+
+    /**
+     * 外宿紧急联系人
+     */
+    @ApiModelProperty("外宿紧急联系人")
+    @TableField("emergency_contact")
+    @Excel(name = "外宿紧急联系人")
+    private String emergencyContact;
+
+    /**
+     * 家长意见（1=同意，0=不同意）
+     */
+    @ApiModelProperty("家长意见（1=同意，0=不同意）")
+    @TableField("parent_opinion")
+    @Excel(name = "家长意见", readConverterExp = "1==同意，0=不同意")
+    private Long parentOpinion;
+
+    /**
+     * 家长签字附件URL
+     */
+    @ApiModelProperty("家长签字附件URL")
+    @TableField("parent_sign_attachment")
+    @Excel(name = "家长签字附件URL")
+    private String parentSignAttachment;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty("家长联系电话")
+    @TableField("parent_phone")
+    @Excel(name = "家长联系电话")
+    private String parentPhone;
+
+    /**
+     * 家长通讯地址-省市区/县
+     */
+    @ApiModelProperty("家长通讯地址-省市区/县")
+    @TableField("parent_address")
+    @Excel(name = "家长通讯地址-省市区/县")
+    private String parentAddress;
+
+    /**
+     * 家长通讯地址-详细地址
+     */
+    @ApiModelProperty("家长通讯地址-详细地址")
+    @TableField("parent_detail_address")
+    @Excel(name = "家长通讯地址-详细地址")
+    private String parentDetailAddress;
+
+    /**
+     * 学生承诺电子签URL
+     */
+    @ApiModelProperty("学生承诺电子签URL")
+    @TableField("student_promise_sign")
+    @Excel(name = "学生承诺电子签URL")
+    private String studentPromiseSign;
+
+    /**
+     * 承诺签署日期
+     */
+    @ApiModelProperty("承诺签署日期")
+    @TableField("promise_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "承诺签署日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date promiseDate;
+
+    /**
+     * 外宿开始时间
+     */
+    @ApiModelProperty("外宿开始时间")
+    @TableField("start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "外宿开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 外宿结束时间（默认次年8月31日）
+     */
+    @ApiModelProperty("外宿结束时间（默认次年8月31日）")
+    @TableField("end_date")
+    @Excel(name = "外宿结束时间", readConverterExp = "默=认次年8月31日")
+    private Date endDate;
+
+    /**
+     * 申请状态（0=草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回）
+     */
+    @ApiModelProperty("申请状态（0=草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回）")
+    @TableField("status")
+    @Excel(name = "申请状态", readConverterExp = "0==草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回")
+    private Long status;
+
+    /**
+     * 驳回原因
+     */
+    @ApiModelProperty("驳回原因")
+    @TableField("reject_reason")
+    @Excel(name = "驳回原因")
+    private String rejectReason;
+
+    /**
+     * 是否有效（1=有效，0=失效/到期）
+     */
+    @ApiModelProperty("是否有效（1=有效，0=失效/到期）")
+    @TableField("is_valid")
+    @Excel(name = "是否有效", readConverterExp = "1==有效，0=失效/到期")
+    private Long isValid;
+
+    /**
+     * 辅导员姓名
+     */
+    @ApiModelProperty("辅导员姓名")
+    @TableField("teacher_name")
+    @Excel(name = "辅导员姓名")
+    private String teacherName;
+
+    /**
+     * 附件id
+     */
+    @ApiModelProperty("附件id")
+    @TableField("affix_id")
+    @Excel(name = "附件id")
+    private String affixId;
+
+    /**
+     * 流程部署编号
+     */
+    @ApiModelProperty("流程部署编号")
+    @TableField("deploy_id")
+    @Excel(name = "流程部署编号")
+    private String deployId;
+
+    /**
+     * Flowable流程实例ID
+     */
+    @ApiModelProperty("Flowable流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "Flowable流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 身份证号码
+     */
+    @ApiModelProperty("身份证号码")
+    @TableField("idCard")
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /**
+     * 学生手机号码
+     */
+    @ApiModelProperty("学生手机号码")
+    @TableField("studentPhone")
+    @Excel(name = "学生手机号码")
+    private String studentPhone;
+
+    /**
+     * 外宿原因学生签名URL
+     */
+    @ApiModelProperty("外宿原因学生签名URL")
+    @TableField("student_signature")
+    @Excel(name = "外宿原因学生签名URL")
+    private String studentSignature;
+
+    /**
+     * 承诺内容
+     */
+    @ApiModelProperty("承诺内容")
+    @TableField("promise_content")
+    @Excel(name = "承诺内容")
+    private String promiseContent;
+
+
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java
new file mode 100644
index 0000000..e6c006a
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java
@@ -0,0 +1,135 @@
+package com.srs.dormitory.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 外宿申请审批记录对象 dms_outside_accommodation_approval
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsOutsideAccommodationApproval对象" , description = "外宿申请审批记录表")
+@TableName("dms_outside_accommodation_approval")
+public class DmsOutsideAccommodationApproval extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 外宿申请ID（关联申请表）
+     */
+    @ApiModelProperty("外宿申请ID（关联申请表）")
+    @TableField("apply_id")
+    @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表")
+    private Long applyId;
+
+    /**
+     * 申请编号
+     */
+    @ApiModelProperty("申请编号")
+    @TableField("apply_no")
+    @Excel(name = "申请编号")
+    private String applyNo;
+
+    /**
+     * 审批节点
+     */
+    @ApiModelProperty("审批节点")
+    @TableField("approval_node")
+    @Excel(name = "审批节点")
+    private String approvalNode;
+
+    /**
+     * 审批人ID
+     */
+    @ApiModelProperty("审批人ID")
+    @TableField("approver_id")
+    @Excel(name = "审批人ID")
+    private Long approverId;
+
+    /**
+     * 审批人姓名
+     */
+    @ApiModelProperty("审批人姓名")
+    @TableField("approver_name")
+    @Excel(name = "审批人姓名")
+    private String approverName;
+
+    /**
+     * 审批人角色
+     */
+    @ApiModelProperty("审批人角色")
+    @TableField("approver_role")
+    @Excel(name = "审批人角色")
+    private String approverRole;
+
+    /**
+     * 审批意见
+     */
+    @ApiModelProperty("审批意见")
+    @TableField("approval_opinion")
+    @Excel(name = "审批意见")
+    private String approvalOpinion;
+
+    /**
+     * 审批结果（1=同意，0=驳回）
+     */
+    @ApiModelProperty("审批结果（1=同意，0=驳回）")
+    @TableField("approval_result")
+    @Excel(name = "审批结果" , readConverterExp = "1==同意，0=驳回")
+    private Long approvalResult;
+
+    /**
+     * 审批时间
+     */
+    @ApiModelProperty("审批时间")
+    @TableField("approval_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvalTime;
+
+    /**
+     * 流程实例ID
+     */
+    @ApiModelProperty("流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    @TableField("student_name")
+    @Excel(name = "学生姓名")
+    private String studentName;
+
+    /**
+     * 学生学号
+     */
+    @ApiModelProperty("学生学号")
+    @TableField("student_no")
+    @Excel(name = "学生学号")
+    private String studentNo;
+
+
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationAttachment.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationAttachment.java
new file mode 100644
index 0000000..aa395a9
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationAttachment.java
@@ -0,0 +1,108 @@
+package com.srs.dormitory.domain;
+
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 外宿申请附件对象 dms_outside_accommodation_attachment
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsOutsideAccommodationAttachment对象" , description = "外宿申请附件表")
+@TableName("dms_outside_accommodation_attachment")
+public class DmsOutsideAccommodationAttachment extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 外宿申请ID（关联申请表）
+     */
+    @ApiModelProperty("外宿申请ID（关联申请表）")
+    @TableField("apply_id")
+    @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表")
+    private Long applyId;
+
+    /**
+     * 附件名称
+     */
+    @ApiModelProperty("附件名称")
+    @TableField("attachment_name")
+    @Excel(name = "附件名称")
+    private String attachmentName;
+
+    /**
+     * 附件存储URL
+     */
+    @ApiModelProperty("附件存储URL")
+    @TableField("attachment_url")
+    @Excel(name = "附件存储URL")
+    private String attachmentUrl;
+
+    /**
+     * 附件类型（1=病例证明，2=住房证明，3=其他）
+     */
+    @ApiModelProperty("附件类型（1=病例证明，2=住房证明，3=其他）")
+    @TableField("attachment_type")
+    @Excel(name = "附件类型" , readConverterExp = "1==病例证明，2=住房证明，3=其他")
+    private Long attachmentType;
+
+    /**
+     * 附件大小（字节）
+     */
+    @ApiModelProperty("附件大小（字节）")
+    @TableField("file_size")
+    @Excel(name = "附件大小" , readConverterExp = "字=节")
+    private Long fileSize;
+
+    /**
+     * 附件后缀（如jpg、pdf）
+     */
+    @ApiModelProperty("附件后缀（如jpg、pdf）")
+    @TableField("file_suffix")
+    @Excel(name = "附件后缀" , readConverterExp = "如=jpg、pdf")
+    private String fileSuffix;
+
+    /**
+     * 流程实例ID
+     */
+    @ApiModelProperty("流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    @TableField("student_name")
+    @Excel(name = "学生姓名")
+    private String studentName;
+
+    /**
+     * 学生学号
+     */
+    @ApiModelProperty("学生学号")
+    @TableField("student_no")
+    @Excel(name = "学生学号")
+    private String studentNo;
+
+
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java
new file mode 100644
index 0000000..8c97882
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsAccommodationsMapper.java
@@ -0,0 +1,64 @@
+package com.srs.dormitory.mapper;
+
+import java.util.List;
+
+import com.srs.dormitory.domain.DmsAccommodations;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 外宿申请Mapper接口
+ *
+ * @author srs
+ * @date 2025-11-11
+ */
+public interface DmsAccommodationsMapper extends BaseMapper<DmsAccommodations> {
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    public DmsAccommodations selectDmsAccommodationsById(Long id);
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 外宿申请集合
+     */
+    List<DmsAccommodations> selectDmsAccommodationsList(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    int insertDmsAccommodations(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    int updateDmsAccommodations(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 删除外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    int deleteDmsAccommodationsById(Long id);
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsAccommodationsByIds(Long[] ids);
+
+    DmsAccommodations getStuDormitory(String stuNo);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApplyMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApplyMapper.java
new file mode 100644
index 0000000..241bdf3
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApplyMapper.java
@@ -0,0 +1,85 @@
+package com.srs.dormitory.mapper;
+
+import java.util.List;
+
+import com.srs.common.doman.vo.TeacherVo;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 外宿申请Mapper接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface DmsOutsideAccommodationApplyMapper extends BaseMapper<DmsOutsideAccommodationApply> {
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyById(Long id);
+
+    /**
+     * 查询外宿申请
+     *
+     * @param processInstanceId 外宿申请流程id
+     * @return 外宿申请
+     */
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyByProcessInstanceId(String processInstanceId);
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 外宿申请集合
+     */
+    List<DmsOutsideAccommodationApply> selectDmsOutsideAccommodationApplyList(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    //    <!--  根据学号查询辅导员信息  -->
+    public TeacherVo getCounselorInfo(String stuNo);
+
+    /**
+     * 查询外宿申请
+     *
+     * @param studentName 学生姓名
+     * @return 应征入伍保留学籍申请
+     */
+    public DmsOutsideAccommodationApply getAccommodationByStuNameAndStuNo(@Param("studentName") String studentName, @Param("studentNo") String studentNo);
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+    int insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 删除外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyById(Long id);
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyByIds(Long[] ids);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java
new file mode 100644
index 0000000..fc2aa53
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java
@@ -0,0 +1,62 @@
+package com.srs.dormitory.mapper;
+
+import java.util.List;
+
+import com.srs.dormitory.domain.DmsOutsideAccommodationApproval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 外宿申请审批记录Mapper接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface DmsOutsideAccommodationApprovalMapper extends BaseMapper<DmsOutsideAccommodationApproval> {
+    /**
+     * 查询外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 外宿申请审批记录
+     */
+    public DmsOutsideAccommodationApproval selectDmsOutsideAccommodationApprovalById(Long id);
+
+    /**
+     * 查询外宿申请审批记录列表
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 外宿申请审批记录集合
+     */
+    List<DmsOutsideAccommodationApproval> selectDmsOutsideAccommodationApprovalList(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 新增外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 修改外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 删除外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalById(Long id);
+
+    /**
+     * 批量删除外宿申请审批记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalByIds(Long[] ids);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationAttachmentMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationAttachmentMapper.java
new file mode 100644
index 0000000..e157e6d
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationAttachmentMapper.java
@@ -0,0 +1,62 @@
+package com.srs.dormitory.mapper;
+
+import java.util.List;
+
+import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 外宿申请附件Mapper接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface DmsOutsideAccommodationAttachmentMapper extends BaseMapper<DmsOutsideAccommodationAttachment> {
+    /**
+     * 查询外宿申请附件
+     *
+     * @param id 外宿申请附件主键
+     * @return 外宿申请附件
+     */
+    public DmsOutsideAccommodationAttachment selectDmsOutsideAccommodationAttachmentById(Long id);
+
+    /**
+     * 查询外宿申请附件列表
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 外宿申请附件集合
+     */
+    List<DmsOutsideAccommodationAttachment> selectDmsOutsideAccommodationAttachmentList(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 新增外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 修改外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 删除外宿申请附件
+     *
+     * @param id 外宿申请附件主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationAttachmentById(Long id);
+
+    /**
+     * 批量删除外宿申请附件
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationAttachmentByIds(Long[] ids);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java
new file mode 100644
index 0000000..3ce54a5
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsAccommodationsService.java
@@ -0,0 +1,64 @@
+package com.srs.dormitory.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.dormitory.domain.DmsAccommodations;
+
+/**
+ * 外宿申请Service接口
+ *
+ * @author srs
+ * @date 2025-11-11
+ */
+public interface IDmsAccommodationsService extends IService<DmsAccommodations> {
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    public DmsAccommodations selectDmsAccommodationsById(Long id);
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 外宿申请集合
+     */
+    List<DmsAccommodations> selectDmsAccommodationsList(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    int insertDmsAccommodations(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    int updateDmsAccommodations(DmsAccommodations dmsAccommodations);
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的外宿申请主键集合
+     * @return 结果
+     */
+    int deleteDmsAccommodationsByIds(Long[] ids);
+
+    /**
+     * 删除外宿申请信息
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    int deleteDmsAccommodationsById(Long id);
+
+    DmsAccommodations getStuDormitory(String stuNo);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApplyService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApplyService.java
new file mode 100644
index 0000000..10dfecc
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApplyService.java
@@ -0,0 +1,70 @@
+package com.srs.dormitory.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+
+/**
+ * 外宿申请Service接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface IDmsOutsideAccommodationApplyService extends IService<DmsOutsideAccommodationApply> {
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyById(Long id);
+
+    /**
+     * 查询外宿申请
+     *
+     * @param processInstanceId 外宿申请流程id
+     * @return 外宿申请
+     */
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyByProcessInstanceId(String processInstanceId);
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 外宿申请集合
+     */
+    List<DmsOutsideAccommodationApply> selectDmsOutsideAccommodationApplyList(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的外宿申请主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyByIds(Long[] ids);
+
+    /**
+     * 删除外宿申请信息
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyById(Long id);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java
new file mode 100644
index 0000000..b83df17
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java
@@ -0,0 +1,62 @@
+package com.srs.dormitory.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApproval;
+
+/**
+ * 外宿申请审批记录Service接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface IDmsOutsideAccommodationApprovalService extends IService<DmsOutsideAccommodationApproval> {
+    /**
+     * 查询外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 外宿申请审批记录
+     */
+    public DmsOutsideAccommodationApproval selectDmsOutsideAccommodationApprovalById(Long id);
+
+    /**
+     * 查询外宿申请审批记录列表
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 外宿申请审批记录集合
+     */
+    List<DmsOutsideAccommodationApproval> selectDmsOutsideAccommodationApprovalList(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 新增外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 修改外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 批量删除外宿申请审批记录
+     *
+     * @param ids 需要删除的外宿申请审批记录主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalByIds(Long[] ids);
+
+    /**
+     * 删除外宿申请审批记录信息
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalById(Long id);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationAttachmentService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationAttachmentService.java
new file mode 100644
index 0000000..abfe070
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationAttachmentService.java
@@ -0,0 +1,62 @@
+package com.srs.dormitory.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
+
+/**
+ * 外宿申请附件Service接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface IDmsOutsideAccommodationAttachmentService extends IService<DmsOutsideAccommodationAttachment> {
+    /**
+     * 查询外宿申请附件
+     *
+     * @param id 外宿申请附件主键
+     * @return 外宿申请附件
+     */
+    public DmsOutsideAccommodationAttachment selectDmsOutsideAccommodationAttachmentById(Long id);
+
+    /**
+     * 查询外宿申请附件列表
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 外宿申请附件集合
+     */
+    List<DmsOutsideAccommodationAttachment> selectDmsOutsideAccommodationAttachmentList(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 新增外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 修改外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment);
+
+    /**
+     * 批量删除外宿申请附件
+     *
+     * @param ids 需要删除的外宿申请附件主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationAttachmentByIds(Long[] ids);
+
+    /**
+     * 删除外宿申请附件信息
+     *
+     * @param id 外宿申请附件主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationAttachmentById(Long id);
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java
new file mode 100644
index 0000000..48038dd
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsAccommodationsServiceImpl.java
@@ -0,0 +1,96 @@
+package com.srs.dormitory.service.impl;
+
+import java.util.List;
+
+import com.srs.common.utils.DateUtils;
+import com.srs.dormitory.domain.DmsAccommodations;
+import com.srs.dormitory.mapper.DmsAccommodationsMapper;
+import com.srs.dormitory.service.IDmsAccommodationsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 外宿申请Service业务层处理
+ *
+ * @author srs
+ * @date 2025-11-11
+ */
+@Service
+public class DmsAccommodationsServiceImpl extends ServiceImpl<DmsAccommodationsMapper, DmsAccommodations> implements IDmsAccommodationsService {
+    @Autowired
+    private DmsAccommodationsMapper dmsAccommodationsMapper;
+
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    @Override
+    public DmsAccommodations selectDmsAccommodationsById(Long id) {
+        return dmsAccommodationsMapper.selectDmsAccommodationsById(id);
+    }
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 外宿申请
+     */
+    @Override
+    public List<DmsAccommodations> selectDmsAccommodationsList(DmsAccommodations dmsAccommodations) {
+        return dmsAccommodationsMapper.selectDmsAccommodationsList(dmsAccommodations);
+    }
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    @Override
+    public int insertDmsAccommodations(DmsAccommodations dmsAccommodations) {
+                dmsAccommodations.setCreateTime(DateUtils.getNowDate());
+            return dmsAccommodationsMapper.insertDmsAccommodations(dmsAccommodations);
+    }
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsAccommodations 外宿申请
+     * @return 结果
+     */
+    @Override
+    public int updateDmsAccommodations(DmsAccommodations dmsAccommodations) {
+                dmsAccommodations.setUpdateTime(DateUtils.getNowDate());
+        return dmsAccommodationsMapper.updateDmsAccommodations(dmsAccommodations);
+    }
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的外宿申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsAccommodationsByIds(Long[] ids) {
+        return dmsAccommodationsMapper.deleteDmsAccommodationsByIds(ids);
+    }
+
+    /**
+     * 删除外宿申请信息
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsAccommodationsById(Long id) {
+        return dmsAccommodationsMapper.deleteDmsAccommodationsById(id);
+    }
+
+    @Override
+    public  DmsAccommodations getStuDormitory(String stuNo){
+        return  dmsAccommodationsMapper.getStuDormitory(stuNo);
+    }
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApplyServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApplyServiceImpl.java
new file mode 100644
index 0000000..9344489
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApplyServiceImpl.java
@@ -0,0 +1,98 @@
+package com.srs.dormitory.service.impl;
+
+import java.util.List;
+
+import com.srs.common.utils.DateUtils;
+import com.srs.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.srs.dormitory.service.IDmsOutsideAccommodationApplyService;
+
+/**
+ * 外宿申请Service业务层处理
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Service
+public class DmsOutsideAccommodationApplyServiceImpl extends ServiceImpl<DmsOutsideAccommodationApplyMapper, DmsOutsideAccommodationApply> implements IDmsOutsideAccommodationApplyService {
+    @Autowired
+    private DmsOutsideAccommodationApplyMapper dmsOutsideAccommodationApplyMapper;
+
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    @Override
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyById(Long id) {
+        return dmsOutsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyById(id);
+    }
+
+    @Override
+    public DmsOutsideAccommodationApply selectDmsOutsideAccommodationApplyByProcessInstanceId(String processInstanceId) {
+        return dmsOutsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyByProcessInstanceId(processInstanceId);
+    }
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 外宿申请
+     */
+    @Override
+    public List<DmsOutsideAccommodationApply> selectDmsOutsideAccommodationApplyList(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
+        return dmsOutsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyList(dmsOutsideAccommodationApply);
+    }
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Override
+    public int insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
+        dmsOutsideAccommodationApply.setCreateTime(DateUtils.getNowDate());
+        dmsOutsideAccommodationApply.setCreateBy(SecurityUtils.getUsername());
+        return dmsOutsideAccommodationApplyMapper.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+    }
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Override
+    public int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
+        dmsOutsideAccommodationApply.setUpdateTime(DateUtils.getNowDate());
+        return dmsOutsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+    }
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的外宿申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationApplyByIds(Long[] ids) {
+        return dmsOutsideAccommodationApplyMapper.deleteDmsOutsideAccommodationApplyByIds(ids);
+    }
+
+    /**
+     * 删除外宿申请信息
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationApplyById(Long id) {
+        return dmsOutsideAccommodationApplyMapper.deleteDmsOutsideAccommodationApplyById(id);
+    }
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApprovalServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApprovalServiceImpl.java
new file mode 100644
index 0000000..0da9248
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApprovalServiceImpl.java
@@ -0,0 +1,87 @@
+package com.srs.dormitory.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.dormitory.mapper.DmsOutsideAccommodationApprovalMapper;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApproval;
+import com.srs.dormitory.service.IDmsOutsideAccommodationApprovalService;
+
+/**
+ * 外宿申请审批记录Service业务层处理
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Service
+public class DmsOutsideAccommodationApprovalServiceImpl extends ServiceImpl<DmsOutsideAccommodationApprovalMapper,DmsOutsideAccommodationApproval> implements IDmsOutsideAccommodationApprovalService {
+    @Autowired
+    private DmsOutsideAccommodationApprovalMapper dmsOutsideAccommodationApprovalMapper;
+
+    /**
+     * 查询外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 外宿申请审批记录
+     */
+    @Override
+    public DmsOutsideAccommodationApproval selectDmsOutsideAccommodationApprovalById(Long id) {
+        return dmsOutsideAccommodationApprovalMapper.selectDmsOutsideAccommodationApprovalById(id);
+    }
+
+    /**
+     * 查询外宿申请审批记录列表
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 外宿申请审批记录
+     */
+    @Override
+    public List<DmsOutsideAccommodationApproval> selectDmsOutsideAccommodationApprovalList(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
+        return dmsOutsideAccommodationApprovalMapper.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
+    }
+
+    /**
+     * 新增外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    @Override
+    public int insertDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
+            return dmsOutsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval);
+    }
+
+    /**
+     * 修改外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    @Override
+    public int updateDmsOutsideAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
+        return dmsOutsideAccommodationApprovalMapper.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval);
+    }
+
+    /**
+     * 批量删除外宿申请审批记录
+     *
+     * @param ids 需要删除的外宿申请审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationApprovalByIds(Long[] ids) {
+        return dmsOutsideAccommodationApprovalMapper.deleteDmsOutsideAccommodationApprovalByIds(ids);
+    }
+
+    /**
+     * 删除外宿申请审批记录信息
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationApprovalById(Long id) {
+        return dmsOutsideAccommodationApprovalMapper.deleteDmsOutsideAccommodationApprovalById(id);
+    }
+}
diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationAttachmentServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationAttachmentServiceImpl.java
new file mode 100644
index 0000000..42f6aaa
--- /dev/null
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationAttachmentServiceImpl.java
@@ -0,0 +1,90 @@
+package com.srs.dormitory.service.impl;
+
+import java.util.List;
+
+import com.srs.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.dormitory.mapper.DmsOutsideAccommodationAttachmentMapper;
+import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
+import com.srs.dormitory.service.IDmsOutsideAccommodationAttachmentService;
+
+/**
+ * 外宿申请附件Service业务层处理
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Service
+public class DmsOutsideAccommodationAttachmentServiceImpl extends ServiceImpl<DmsOutsideAccommodationAttachmentMapper,DmsOutsideAccommodationAttachment> implements IDmsOutsideAccommodationAttachmentService {
+    @Autowired
+    private DmsOutsideAccommodationAttachmentMapper dmsOutsideAccommodationAttachmentMapper;
+
+    /**
+     * 查询外宿申请附件
+     *
+     * @param id 外宿申请附件主键
+     * @return 外宿申请附件
+     */
+    @Override
+    public DmsOutsideAccommodationAttachment selectDmsOutsideAccommodationAttachmentById(Long id) {
+        return dmsOutsideAccommodationAttachmentMapper.selectDmsOutsideAccommodationAttachmentById(id);
+    }
+
+    /**
+     * 查询外宿申请附件列表
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 外宿申请附件
+     */
+    @Override
+    public List<DmsOutsideAccommodationAttachment> selectDmsOutsideAccommodationAttachmentList(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
+        return dmsOutsideAccommodationAttachmentMapper.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
+    }
+
+    /**
+     * 新增外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    @Override
+    public int insertDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
+                dmsOutsideAccommodationAttachment.setCreateTime(DateUtils.getNowDate());
+            return dmsOutsideAccommodationAttachmentMapper.insertDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment);
+    }
+
+    /**
+     * 修改外宿申请附件
+     *
+     * @param dmsOutsideAccommodationAttachment 外宿申请附件
+     * @return 结果
+     */
+    @Override
+    public int updateDmsOutsideAccommodationAttachment(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
+        return dmsOutsideAccommodationAttachmentMapper.updateDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment);
+    }
+
+    /**
+     * 批量删除外宿申请附件
+     *
+     * @param ids 需要删除的外宿申请附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationAttachmentByIds(Long[] ids) {
+        return dmsOutsideAccommodationAttachmentMapper.deleteDmsOutsideAccommodationAttachmentByIds(ids);
+    }
+
+    /**
+     * 删除外宿申请附件信息
+     *
+     * @param id 外宿申请附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDmsOutsideAccommodationAttachmentById(Long id) {
+        return dmsOutsideAccommodationAttachmentMapper.deleteDmsOutsideAccommodationAttachmentById(id);
+    }
+}
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml
new file mode 100644
index 0000000..80d77b0
--- /dev/null
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsAccommodationsMapper.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.dormitory.mapper.DmsAccommodationsMapper">
+
+    <resultMap type="DmsAccommodations" id="DmsAccommodationsResult">
+        <result property="id"    column="id"    />
+        <result property="stuNo"    column="stu_no"    />
+        <result property="stuName"    column="stu_name"    />
+        <result property="birthday"    column="birthday"    />
+        <result property="gender"    column="gender"    />
+        <result property="className"    column="class_name"    />
+        <result property="stuPhone"    column="stu_phone"    />
+        <result property="sfzh"    column="sfzh"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="majorName"    column="major_name"    />
+        <result property="gradeName"    column="grade_name"    />
+        <result property="roomNo"    column="room_no"    />
+        <result property="isCharge"    column="isCharge"    />
+        <result property="sleepOutRemark"    column="sleep_out_remark"    />
+        <result property="address"    column="address"    />
+        <result property="emergencyContact"    column="emergency_contact"    />
+        <result property="parentComment"    column="parent_comment"    />
+        <result property="parentTel"    column="parent_tel"    />
+        <result property="parentAddress"    column="parent_address"    />
+        <result property="reviewerStatus"    column="reviewer_status"    />
+        <result property="applySign"    column="apply_sign"    />
+        <result property="applyDate"    column="apply_date"    />
+        <result property="applySign2"    column="apply_sign2"    />
+        <result property="applyDate2"    column="apply_date2"    />
+        <result property="fdyCmt"    column="fdy_cmt"    />
+        <result property="fdySign"    column="fdy_sign"    />
+        <result property="fdyDate"    column="fdy_date"    />
+        <result property="fdyNo"    column="fdy_no"    />
+        <result property="deptCmt"    column="dept_cmt"    />
+        <result property="deptSign"    column="dept_sign"    />
+        <result property="deptDate"    column="dept_date"    />
+        <result property="deptNo"    column="dept_no"    />
+        <result property="xgCmt"    column="xg_cmt"    />
+        <result property="xgSign"    column="xg_sign"    />
+        <result property="xgDate"    column="xg_date"    />
+        <result property="xgNo"    column="xg_no"    />
+        <result property="leaderCmt"    column="leader_cmt"    />
+        <result property="leaderSign"    column="leader_sign"    />
+        <result property="leaderDate"    column="leader_date"    />
+        <result property="leaderNo"    column="leader_no"    />
+        <result property="stuYearName"    column="stu_year_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectDmsAccommodationsVo">
+        select id, stu_no, stu_name, birthday, gender, class_name, stu_phone, sfzh, dept_name, major_name, grade_name, room_no, isCharge, sleep_out_remark, address, emergency_contact, parent_comment, parent_tel, parent_address, reviewer_status, apply_sign, apply_date, apply_sign2, apply_date2,fdy_cmt, fdy_sign, fdy_date, fdy_no, dept_cmt, dept_sign, dept_date, dept_no, xg_cmt, xg_sign, xg_date, xg_no, leader_cmt, leader_sign, leader_date, leader_no, stu_year_name, create_time, create_by, update_time, update_by from dms_accommodations
+    </sql>
+
+    <select id="selectDmsAccommodationsList" parameterType="DmsAccommodations" resultMap="DmsAccommodationsResult">
+        <include refid="selectDmsAccommodationsVo"/>
+        <where>
+            <if test="stuNo != null  and stuNo != ''"> and stu_no = #{stuNo}</if>
+            <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="majorName != null  and majorName != ''"> and major_name like concat('%', #{majorName}, '%')</if>
+            <if test="gradeName != null  and gradeName != ''"> and grade_name like concat('%', #{gradeName}, '%')</if>
+            <if test="roomNo != null  and roomNo != ''"> and room_no = #{roomNo}</if>
+        </where>
+    </select>
+
+    <select id="selectDmsAccommodationsById" parameterType="Long" resultMap="DmsAccommodationsResult">
+        <include refid="selectDmsAccommodationsVo"/>
+        where id = #{id}
+    </select>
+    <select id="getStuDormitory" resultType="com.srs.dormitory.domain.DmsAccommodations" parameterType="String">
+        select e.name,a.room_no,b.`status`,a.charge_standard,f.signature from dms_dormitory a
+        left join srs_dormitory_student  b on a.id=b.dormitory_id
+        left join dms_dormitory_floor c  on c.id=a.floor_id
+        left join dms_dormitory_building d on d.id=c.building_id
+        left join dms_dormitory_park e on e.id=d.park_id
+        left join sys_user f on f.user_name=b.stu_no
+        where b.stu_no=#{stuNo}
+    </select>
+
+    <insert id="insertDmsAccommodations" parameterType="DmsAccommodations" useGeneratedKeys="true" keyProperty="id">
+        insert into dms_accommodations
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stuNo != null">stu_no,</if>
+            <if test="stuName != null">stu_name,</if>
+            <if test="birthday != null">birthday,</if>
+            <if test="gender != null">gender,</if>
+            <if test="className != null">class_name,</if>
+            <if test="stuPhone != null">stu_phone,</if>
+            <if test="sfzh != null">sfzh,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="majorName != null">major_name,</if>
+            <if test="gradeName != null">grade_name,</if>
+            <if test="roomNo != null">room_no,</if>
+            <if test="isCharge != null">isCharge,</if>
+            <if test="sleepOutRemark != null">sleep_out_remark,</if>
+            <if test="address != null">address,</if>
+            <if test="emergencyContact != null">emergency_contact,</if>
+            <if test="parentComment != null">parent_comment,</if>
+            <if test="parentTel != null">parent_tel,</if>
+            <if test="parentAddress != null">parent_address,</if>
+            <if test="reviewerStatus != null">reviewer_status,</if>
+            <if test="applySign != null">apply_sign,</if>
+            <if test="applyDate != null">apply_date,</if>
+            <if test="applySign2 != null">apply_sign2,</if>
+            <if test="applyDate2 != null">apply_date2,</if>
+            <if test="fdyCmt != null">fdy_cmt,</if>
+            <if test="fdySign != null">fdy_sign,</if>
+            <if test="fdyDate != null">fdy_date,</if>
+            <if test="fdyNo != null">fdy_no,</if>
+            <if test="deptCmt != null">dept_cmt,</if>
+            <if test="deptSign != null">dept_sign,</if>
+            <if test="deptDate != null">dept_date,</if>
+            <if test="deptNo != null">dept_no,</if>
+            <if test="xgCmt != null">xg_cmt,</if>
+            <if test="xgSign != null">xg_sign,</if>
+            <if test="xgDate != null">xg_date,</if>
+            <if test="xgNo != null">xg_no,</if>
+            <if test="leaderCmt != null">leader_cmt,</if>
+            <if test="leaderSign != null">leader_sign,</if>
+            <if test="leaderDate != null">leader_date,</if>
+            <if test="leaderNo != null">leader_no,</if>
+            <if test="stuYearName != null">stu_year_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stuNo != null">#{stuNo},</if>
+            <if test="stuName != null">#{stuName},</if>
+            <if test="birthday != null">#{birthday},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="className != null">#{className},</if>
+            <if test="stuPhone != null">#{stuPhone},</if>
+            <if test="sfzh != null">#{sfzh},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="majorName != null">#{majorName},</if>
+            <if test="gradeName != null">#{gradeName},</if>
+            <if test="roomNo != null">#{roomNo},</if>
+            <if test="isCharge != null">#{isCharge},</if>
+            <if test="sleepOutRemark != null">#{sleepOutRemark},</if>
+            <if test="address != null">#{address},</if>
+            <if test="emergencyContact != null">#{emergencyContact},</if>
+            <if test="parentComment != null">#{parentComment},</if>
+            <if test="parentTel != null">#{parentTel},</if>
+            <if test="parentAddress != null">#{parentAddress},</if>
+            <if test="reviewerStatus != null">#{reviewerStatus},</if>
+            <if test="applySign != null">#{applySign},</if>
+            <if test="applyDate != null">#{applyDate},</if>
+            <if test="applySign2 != null">#{applySign2},</if>
+            <if test="applyDate2 != null">#{applyDate2},</if>
+            <if test="fdyCmt != null">#{fdyCmt},</if>
+            <if test="fdySign != null">#{fdySign},</if>
+            <if test="fdyDate != null">#{fdyDate},</if>
+            <if test="fdyNo != null">#{fdyNo},</if>
+            <if test="deptCmt != null">#{deptCmt},</if>
+            <if test="deptSign != null">#{deptSign},</if>
+            <if test="deptDate != null">#{deptDate},</if>
+            <if test="deptNo != null">#{deptNo},</if>
+            <if test="xgCmt != null">#{xgCmt},</if>
+            <if test="xgSign != null">#{xgSign},</if>
+            <if test="xgDate != null">#{xgDate},</if>
+            <if test="xgNo != null">#{xgNo},</if>
+            <if test="leaderCmt != null">#{leaderCmt},</if>
+            <if test="leaderSign != null">#{leaderSign},</if>
+            <if test="leaderDate != null">#{leaderDate},</if>
+            <if test="leaderNo != null">#{leaderNo},</if>
+            <if test="stuYearName != null">#{stuYearName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDmsAccommodations" parameterType="DmsAccommodations">
+        update dms_accommodations
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stuNo != null">stu_no = #{stuNo},</if>
+            <if test="stuName != null">stu_name = #{stuName},</if>
+            <if test="birthday != null">birthday = #{birthday},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="stuPhone != null">stu_phone = #{stuPhone},</if>
+            <if test="sfzh != null">sfzh = #{sfzh},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="majorName != null">major_name = #{majorName},</if>
+            <if test="gradeName != null">grade_name = #{gradeName},</if>
+            <if test="roomNo != null">room_no = #{roomNo},</if>
+            <if test="isCharge != null">isCharge = #{isCharge},</if>
+            <if test="sleepOutRemark != null">sleep_out_remark = #{sleepOutRemark},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="emergencyContact != null">emergency_contact = #{emergencyContact},</if>
+            <if test="parentComment != null">parent_comment = #{parentComment},</if>
+            <if test="parentTel != null">parent_tel = #{parentTel},</if>
+            <if test="parentAddress != null">parent_address = #{parentAddress},</if>
+            <if test="reviewerStatus != null">reviewer_status = #{reviewerStatus},</if>
+            <if test="applySign != null">apply_sign = #{applySign},</if>
+            <if test="applyDate != null">apply_date = #{applyDate},</if>
+            <if test="applySign2 != null">apply_sign2 = #{applySign2},</if>
+            <if test="applyDate2 != null">apply_date2 = #{applyDate2},</if>
+            <if test="fdyCmt != null">fdy_cmt = #{fdyCmt},</if>
+            <if test="fdySign != null">fdy_sign = #{fdySign},</if>
+            <if test="fdyDate != null">fdy_date = #{fdyDate},</if>
+            <if test="fdyNo != null">fdy_no = #{fdyNo},</if>
+            <if test="deptCmt != null">dept_cmt = #{deptCmt},</if>
+            <if test="deptSign != null">dept_sign = #{deptSign},</if>
+            <if test="deptDate != null">dept_date = #{deptDate},</if>
+            <if test="deptNo != null">dept_no = #{deptNo},</if>
+            <if test="xgCmt != null">xg_cmt = #{xgCmt},</if>
+            <if test="xgSign != null">xg_sign = #{xgSign},</if>
+            <if test="xgDate != null">xg_date = #{xgDate},</if>
+            <if test="xgNo != null">xg_no = #{xgNo},</if>
+            <if test="leaderCmt != null">leader_cmt = #{leaderCmt},</if>
+            <if test="leaderSign != null">leader_sign = #{leaderSign},</if>
+            <if test="leaderDate != null">leader_date = #{leaderDate},</if>
+            <if test="leaderNo != null">leader_no = #{leaderNo},</if>
+            <if test="stuYearName != null">stu_year_name = #{stuYearName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsAccommodationsById" parameterType="Long">
+        delete from dms_accommodations where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsAccommodationsByIds" parameterType="String">
+        delete from dms_accommodations where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
new file mode 100644
index 0000000..f64f9ad
--- /dev/null
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper">
+
+    <resultMap type="DmsOutsideAccommodationApply" id="DmsOutsideAccommodationApplyResult">
+        <result property="id" column="id"/>
+        <result property="applyNo" column="apply_no"/>
+        <result property="studentId" column="student_id"/>
+        <result property="studentNo" column="student_no"/>
+        <result property="studentName" column="student_name"/>
+        <result property="gender" column="gender"/>
+        <result property="birthDate" column="birth_date"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="majorId" column="major_id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="classId" column="class_id"/>
+        <result property="className" column="class_name"/>
+        <result property="originalDormitory" column="original_dormitory"/>
+        <result property="accommodationFee" column="accommodation_fee"/>
+        <result property="accommodationFeeStatus" column="accommodation_fee_status"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="outsideAddress" column="outside_address"/>
+        <result property="address" column="address"/>
+        <result property="emergencyPhone" column="emergency_phone"/>
+        <result property="emergencyContact" column="emergency_contact"/>
+        <result property="parentOpinion" column="parent_opinion"/>
+        <result property="parentSignAttachment" column="parent_sign_attachment"/>
+        <result property="parentPhone" column="parent_phone"/>
+        <result property="parentAddress" column="parent_address"/>
+        <result property="parentDetailAddress" column="parent_detail_address"/>
+        <result property="studentPromiseSign" column="student_promise_sign"/>
+        <result property="promiseDate" column="promise_date"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="status" column="status"/>
+        <result property="rejectReason" column="reject_reason"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="isValid" column="is_valid"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="affixId" column="affix_id"/>
+        <result property="deployId" column="deploy_id"/>
+        <result property="processInstanceId" column="process_instance_id"/>
+        <result property="idCard" column="idCard"/>
+        <result property="studentPhone" column="studentPhone"/>
+        <result property="studentSignature" column="student_signature"/>
+        <result property="promiseContent"    column="promise_content"    />
+    </resultMap>
+
+    <sql id="selectDmsOutsideAccommodationApplyVo">
+        select id,
+               apply_no,
+               student_id,
+               student_no,
+               student_name,
+               gender,
+               birth_date,
+               dept_id,
+               dept_name,
+               major_id,
+               major_name,
+               class_id,
+               class_name,
+               original_dormitory,
+               accommodation_fee,
+               accommodation_fee_status,
+               apply_reason,
+               outside_address,
+               address,
+               emergency_phone,
+               emergency_contact,
+               parent_opinion,
+               parent_sign_attachment,
+               parent_phone,
+               parent_address,
+               parent_detail_address,
+               student_promise_sign,
+               promise_date,
+               start_date,
+               end_date,
+               status,
+               reject_reason,
+               create_time,
+               create_by,
+               update_time,
+               update_by,
+               is_valid,
+               teacher_name,
+               affix_id,
+               deploy_id,
+               process_instance_id,
+               idCard,
+               studentPhone,
+               student_signature,
+               promise_content
+        from dms_outside_accommodation_apply
+    </sql>
+
+    <select id="selectDmsOutsideAccommodationApplyList" parameterType="DmsOutsideAccommodationApply"
+            resultMap="DmsOutsideAccommodationApplyResult">
+        <include refid="selectDmsOutsideAccommodationApplyVo"/>
+        <where>
+            <if test="applyNo != null  and applyNo != ''">and apply_no = #{applyNo}</if>
+            <if test="studentId != null ">and student_id = #{studentId}</if>
+            <if test="studentNo != null  and studentNo != ''">and student_no = #{studentNo}</if>
+            <if test="studentName != null  and studentName != ''">and student_name like concat('%', #{studentName},
+                '%')
+            </if>
+            <if test="gender != null  and gender != ''">and gender = #{gender}</if>
+            <if test="birthDate != null ">and birth_date = #{birthDate}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="majorId != null ">and major_id = #{majorId}</if>
+            <if test="majorName != null  and majorName != ''">and major_name like concat('%', #{majorName}, '%')</if>
+            <if test="classId != null ">and class_id = #{classId}</if>
+            <if test="className != null  and className != ''">and class_name like concat('%', #{className}, '%')</if>
+            <if test="originalDormitory != null  and originalDormitory != ''">and original_dormitory =
+                #{originalDormitory}
+            </if>
+            <if test="accommodationFee != null  and accommodationFee != ''">and accommodation_fee =
+                #{accommodationFee}
+            </if>
+            <if test="accommodationFeeStatus != null ">and accommodation_fee_status = #{accommodationFeeStatus}</if>
+            <if test="applyReason != null  and applyReason != ''">and apply_reason = #{applyReason}</if>
+            <if test="outsideAddress != null  and outsideAddress != ''">and outside_address = #{outsideAddress}</if>
+            <if test="address != null  and address != ''">and address = #{address}</if>
+            <if test="emergencyPhone != null  and emergencyPhone != ''">and emergency_phone = #{emergencyPhone}</if>
+            <if test="emergencyContact != null  and emergencyContact != ''">and emergency_contact =
+                #{emergencyContact}
+            </if>
+            <if test="parentOpinion != null ">and parent_opinion = #{parentOpinion}</if>
+            <if test="parentSignAttachment != null  and parentSignAttachment != ''">and parent_sign_attachment =
+                #{parentSignAttachment}
+            </if>
+            <if test="parentPhone != null  and parentPhone != ''">and parent_phone = #{parentPhone}</if>
+            <if test="parentAddress != null  and parentAddress != ''">and parent_address = #{parentAddress}</if>
+            <if test="parentDetailAddress != null  and parentDetailAddress != ''">and parent_detail_address =
+                #{parentDetailAddress}
+            </if>
+            <if test="studentPromiseSign != null  and studentPromiseSign != ''">and student_promise_sign =
+                #{studentPromiseSign}
+            </if>
+            <if test="promiseDate != null ">and promise_date = #{promiseDate}</if>
+            <if test="startDate != null ">and start_date = #{startDate}</if>
+            <if test="endDate != null ">and end_date = #{endDate}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="rejectReason != null  and rejectReason != ''">and reject_reason = #{rejectReason}</if>
+            <if test="isValid != null ">and is_valid = #{isValid}</if>
+            <if test="teacherName != null  and teacherName != ''">and teacher_name like concat('%', #{teacherName},
+                '%')
+            </if>
+            <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
+            <if test="deployId != null  and deployId != ''">and deploy_id = #{deployId}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''">and process_instance_id =
+                #{processInstanceId}
+            </if>
+            <if test="idCard != null  and idCard != ''">and idCard = #{idCard}</if>
+            <if test="studentPhone != null  and studentPhone != ''">and studentPhone = #{studentPhone}</if>
+            <if test="studentSignature != null  and studentSignature != ''">and student_signature =
+                #{studentSignature}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDmsOutsideAccommodationApplyById" parameterType="Long"
+            resultMap="DmsOutsideAccommodationApplyResult">
+        <include refid="selectDmsOutsideAccommodationApplyVo"/>
+        where id = #{id}
+    </select>
+
+    <!--根据流程ID查询信息-->
+    <select id="selectDmsOutsideAccommodationApplyByProcessInstanceId" parameterType="String"
+            resultMap="DmsOutsideAccommodationApplyResult">
+        <include refid="selectDmsOutsideAccommodationApplyVo"/>
+        where processInstanceId = #{process_instance_id}
+    </select>
+
+    <!--根据学生姓名和学号查询申请表-->
+    <select id="getAccommodationByStuNameAndStuNo" resultMap="DmsOutsideAccommodationApplyResult">
+        select *
+        from dms_outside_accommodation_apply
+        <where>
+            <if test="studentName != null and studentName != ''">
+                and student_name = #{studentName}
+            </if>
+            <if test="studentNo != null and studentNo != ''">
+                and student_no = #{studentNo}
+            </if>
+        </where>
+    </select>
+
+
+    <!--  根据学号查询辅导员信息  -->
+    <select id="getCounselorInfo" resultType="com.srs.common.doman.vo.TeacherVo">
+        SELECT d.user_id userId, d.dept_id deptId, d.user_name userName, d.nick_name nickName
+        FROM srs_student a
+                 LEFT JOIN srs_class b ON a.class_id = b.class_id
+                 LEFT JOIN cph_teacher c ON b.teacher_id = c.teacher_id
+                 LEFT JOIN sys_user d ON c.employee_id = d.user_name
+        WHERE a.stu_no = #{stuNo}
+    </select>
+
+    <insert id="insertDmsOutsideAccommodationApply" parameterType="DmsOutsideAccommodationApply" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into dms_outside_accommodation_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no,</if>
+            <if test="studentId != null">student_id,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="gender != null">gender,</if>
+            <if test="birthDate != null">birth_date,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="majorId != null">major_id,</if>
+            <if test="majorName != null and majorName != ''">major_name,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="className != null and className != ''">class_name,</if>
+            <if test="originalDormitory != null and originalDormitory != ''">original_dormitory,</if>
+            <if test="accommodationFee != null and accommodationFee != ''">accommodation_fee,</if>
+            <if test="accommodationFeeStatus != null">accommodation_fee_status,</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason,</if>
+            <if test="outsideAddress != null and outsideAddress != ''">outside_address,</if>
+            <if test="address != null and address != ''">address,</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">emergency_phone,</if>
+            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact,</if>
+            <if test="parentOpinion != null">parent_opinion,</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">parent_sign_attachment,</if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone,</if>
+            <if test="parentAddress != null and parentAddress != ''">parent_address,</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">parent_detail_address,</if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">student_promise_sign,</if>
+            <if test="promiseDate != null">promise_date,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="status != null">status,</if>
+            <if test="rejectReason != null">reject_reason,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="isValid != null">is_valid,</if>
+            <if test="teacherName != null and teacherName != ''">teacher_name,</if>
+            <if test="affixId != null">affix_id,</if>
+            <if test="deployId != null">deploy_id,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="idCard != null and idCard != ''">idCard,</if>
+            <if test="studentPhone != null">studentPhone,</if>
+            <if test="studentSignature != null">student_signature,</if>
+            <if test="promiseContent != null">promise_content,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
+            <if test="studentId != null">#{studentId},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="birthDate != null">#{birthDate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="majorId != null">#{majorId},</if>
+            <if test="majorName != null and majorName != ''">#{majorName},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="className != null and className != ''">#{className},</if>
+            <if test="originalDormitory != null and originalDormitory != ''">#{originalDormitory},</if>
+            <if test="accommodationFee != null and accommodationFee != ''">#{accommodationFee},</if>
+            <if test="accommodationFeeStatus != null">#{accommodationFeeStatus},</if>
+            <if test="applyReason != null and applyReason != ''">#{applyReason},</if>
+            <if test="outsideAddress != null and outsideAddress != ''">#{outsideAddress},</if>
+            <if test="address != null and address != ''">#{address},</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">#{emergencyPhone},</if>
+            <if test="emergencyContact != null and emergencyContact != ''">#{emergencyContact},</if>
+            <if test="parentOpinion != null">#{parentOpinion},</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">#{parentSignAttachment},</if>
+            <if test="parentPhone != null and parentPhone != ''">#{parentPhone},</if>
+            <if test="parentAddress != null and parentAddress != ''">#{parentAddress},</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">#{parentDetailAddress},</if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">#{studentPromiseSign},</if>
+            <if test="promiseDate != null">#{promiseDate},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="rejectReason != null">#{rejectReason},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="isValid != null">#{isValid},</if>
+            <if test="teacherName != null and teacherName != ''">#{teacherName},</if>
+            <if test="affixId != null">#{affixId},</if>
+            <if test="deployId != null">#{deployId},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="idCard != null and idCard != ''">#{idCard},</if>
+            <if test="studentPhone != null">#{studentPhone},</if>
+            <if test="studentSignature != null">#{studentSignature},</if>
+            <if test="promiseContent != null">#{promiseContent},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDmsOutsideAccommodationApply" parameterType="DmsOutsideAccommodationApply">
+        update dms_outside_accommodation_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="birthDate != null">birth_date = #{birthDate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="majorId != null">major_id = #{majorId},</if>
+            <if test="majorName != null and majorName != ''">major_name = #{majorName},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="originalDormitory != null and originalDormitory != ''">original_dormitory =
+                #{originalDormitory},
+            </if>
+            <if test="accommodationFee != null and accommodationFee != ''">accommodation_fee = #{accommodationFee},</if>
+            <if test="accommodationFeeStatus != null">accommodation_fee_status = #{accommodationFeeStatus},</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason = #{applyReason},</if>
+            <if test="outsideAddress != null and outsideAddress != ''">outside_address = #{outsideAddress},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">emergency_phone = #{emergencyPhone},</if>
+            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact = #{emergencyContact},</if>
+            <if test="parentOpinion != null">parent_opinion = #{parentOpinion},</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">parent_sign_attachment =
+                #{parentSignAttachment},
+            </if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone = #{parentPhone},</if>
+            <if test="parentAddress != null and parentAddress != ''">parent_address = #{parentAddress},</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">parent_detail_address =
+                #{parentDetailAddress},
+            </if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">student_promise_sign =
+                #{studentPromiseSign},
+            </if>
+            <if test="promiseDate != null">promise_date = #{promiseDate},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="rejectReason != null">reject_reason = #{rejectReason},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="isValid != null">is_valid = #{isValid},</if>
+            <if test="teacherName != null and teacherName != ''">teacher_name = #{teacherName},</if>
+            <if test="affixId != null">affix_id = #{affixId},</if>
+            <if test="deployId != null">deploy_id = #{deployId},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="idCard != null and idCard != ''">idCard = #{idCard},</if>
+            <if test="studentPhone != null">studentPhone = #{studentPhone},</if>
+            <if test="studentSignature != null">student_signature = #{studentSignature},</if>
+            <if test="promiseContent != null">promise_content = #{promiseContent},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsOutsideAccommodationApplyById" parameterType="Long">
+        delete
+        from dms_outside_accommodation_apply
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsOutsideAccommodationApplyByIds" parameterType="String">
+        delete from dms_outside_accommodation_apply where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml
new file mode 100644
index 0000000..d13d8b2
--- /dev/null
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.dormitory.mapper.DmsOutsideAccommodationApprovalMapper">
+    
+    <resultMap type="DmsOutsideAccommodationApproval" id="DmsOutsideAccommodationApprovalResult">
+        <result property="id"    column="id"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="applyNo"    column="apply_no"    />
+        <result property="approvalNode"    column="approval_node"    />
+        <result property="approverId"    column="approver_id"    />
+        <result property="approverName"    column="approver_name"    />
+        <result property="approverRole"    column="approver_role"    />
+        <result property="approvalOpinion"    column="approval_opinion"    />
+        <result property="approvalResult"    column="approval_result"    />
+        <result property="approvalTime"    column="approval_time"    />
+        <result property="processInstanceId"    column="process_instance_id"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="studentNo"    column="student_no"    />
+    </resultMap>
+
+    <sql id="selectDmsOutsideAccommodationApprovalVo">
+        select id, apply_id, apply_no, approval_node, approver_id, approver_name, approver_role, approval_opinion, approval_result, approval_time, process_instance_id, student_name, student_no from dms_outside_accommodation_approval
+    </sql>
+
+    <select id="selectDmsOutsideAccommodationApprovalList" parameterType="DmsOutsideAccommodationApproval" resultMap="DmsOutsideAccommodationApprovalResult">
+        <include refid="selectDmsOutsideAccommodationApprovalVo"/>
+        <where>  
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="applyNo != null  and applyNo != ''"> and apply_no = #{applyNo}</if>
+            <if test="approvalNode != null "> and approval_node = #{approvalNode}</if>
+            <if test="approverId != null "> and approver_id = #{approverId}</if>
+            <if test="approverName != null  and approverName != ''"> and approver_name like concat('%', #{approverName}, '%')</if>
+            <if test="approverRole != null  and approverRole != ''"> and approver_role = #{approverRole}</if>
+            <if test="approvalOpinion != null  and approvalOpinion != ''"> and approval_opinion = #{approvalOpinion}</if>
+            <if test="approvalResult != null "> and approval_result = #{approvalResult}</if>
+            <if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="studentNo != null  and studentNo != ''"> and student_no = #{studentNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectDmsOutsideAccommodationApprovalById" parameterType="Long" resultMap="DmsOutsideAccommodationApprovalResult">
+        <include refid="selectDmsOutsideAccommodationApprovalVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDmsOutsideAccommodationApproval" parameterType="DmsOutsideAccommodationApproval" useGeneratedKeys="true" keyProperty="id">
+        insert into dms_outside_accommodation_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">apply_id,</if>
+            <if test="applyNo != null and applyNo != ''">apply_no,</if>
+            <if test="approvalNode != null">approval_node,</if>
+            <if test="approverId != null">approver_id,</if>
+            <if test="approverName != null and approverName != ''">approver_name,</if>
+            <if test="approverRole != null and approverRole != ''">approver_role,</if>
+            <if test="approvalOpinion != null">approval_opinion,</if>
+            <if test="approvalResult != null">approval_result,</if>
+            <if test="approvalTime != null">approval_time,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">#{applyId},</if>
+            <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
+            <if test="approvalNode != null">#{approvalNode},</if>
+            <if test="approverId != null">#{approverId},</if>
+            <if test="approverName != null and approverName != ''">#{approverName},</if>
+            <if test="approverRole != null and approverRole != ''">#{approverRole},</if>
+            <if test="approvalOpinion != null">#{approvalOpinion},</if>
+            <if test="approvalResult != null">#{approvalResult},</if>
+            <if test="approvalTime != null">#{approvalTime},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDmsOutsideAccommodationApproval" parameterType="DmsOutsideAccommodationApproval">
+        update dms_outside_accommodation_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
+            <if test="approvalNode != null">approval_node = #{approvalNode},</if>
+            <if test="approverId != null">approver_id = #{approverId},</if>
+            <if test="approverName != null and approverName != ''">approver_name = #{approverName},</if>
+            <if test="approverRole != null and approverRole != ''">approver_role = #{approverRole},</if>
+            <if test="approvalOpinion != null">approval_opinion = #{approvalOpinion},</if>
+            <if test="approvalResult != null">approval_result = #{approvalResult},</if>
+            <if test="approvalTime != null">approval_time = #{approvalTime},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsOutsideAccommodationApprovalById" parameterType="Long">
+        delete from dms_outside_accommodation_approval where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsOutsideAccommodationApprovalByIds" parameterType="String">
+        delete from dms_outside_accommodation_approval where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml
new file mode 100644
index 0000000..bd3dbb6
--- /dev/null
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.dormitory.mapper.DmsOutsideAccommodationAttachmentMapper">
+    
+    <resultMap type="DmsOutsideAccommodationAttachment" id="DmsOutsideAccommodationAttachmentResult">
+        <result property="id"    column="id"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="attachmentName"    column="attachment_name"    />
+        <result property="attachmentUrl"    column="attachment_url"    />
+        <result property="attachmentType"    column="attachment_type"    />
+        <result property="fileSize"    column="file_size"    />
+        <result property="fileSuffix"    column="file_suffix"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="processInstanceId"    column="process_instance_id"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="studentNo"    column="student_no"    />
+    </resultMap>
+
+    <sql id="selectDmsOutsideAccommodationAttachmentVo">
+        select id, apply_id, attachment_name, attachment_url, attachment_type, file_size, file_suffix, create_time, process_instance_id, student_name, student_no from dms_outside_accommodation_attachment
+    </sql>
+
+    <select id="selectDmsOutsideAccommodationAttachmentList" parameterType="DmsOutsideAccommodationAttachment" resultMap="DmsOutsideAccommodationAttachmentResult">
+        <include refid="selectDmsOutsideAccommodationAttachmentVo"/>
+        <where>  
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="attachmentName != null  and attachmentName != ''"> and attachment_name like concat('%', #{attachmentName}, '%')</if>
+            <if test="attachmentUrl != null  and attachmentUrl != ''"> and attachment_url = #{attachmentUrl}</if>
+            <if test="attachmentType != null "> and attachment_type = #{attachmentType}</if>
+            <if test="fileSize != null "> and file_size = #{fileSize}</if>
+            <if test="fileSuffix != null  and fileSuffix != ''"> and file_suffix = #{fileSuffix}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="studentNo != null  and studentNo != ''"> and student_no = #{studentNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectDmsOutsideAccommodationAttachmentById" parameterType="Long" resultMap="DmsOutsideAccommodationAttachmentResult">
+        <include refid="selectDmsOutsideAccommodationAttachmentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDmsOutsideAccommodationAttachment" parameterType="DmsOutsideAccommodationAttachment" useGeneratedKeys="true" keyProperty="id">
+        insert into dms_outside_accommodation_attachment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">apply_id,</if>
+            <if test="attachmentName != null and attachmentName != ''">attachment_name,</if>
+            <if test="attachmentUrl != null and attachmentUrl != ''">attachment_url,</if>
+            <if test="attachmentType != null">attachment_type,</if>
+            <if test="fileSize != null">file_size,</if>
+            <if test="fileSuffix != null and fileSuffix != ''">file_suffix,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">#{applyId},</if>
+            <if test="attachmentName != null and attachmentName != ''">#{attachmentName},</if>
+            <if test="attachmentUrl != null and attachmentUrl != ''">#{attachmentUrl},</if>
+            <if test="attachmentType != null">#{attachmentType},</if>
+            <if test="fileSize != null">#{fileSize},</if>
+            <if test="fileSuffix != null and fileSuffix != ''">#{fileSuffix},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDmsOutsideAccommodationAttachment" parameterType="DmsOutsideAccommodationAttachment">
+        update dms_outside_accommodation_attachment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="attachmentName != null and attachmentName != ''">attachment_name = #{attachmentName},</if>
+            <if test="attachmentUrl != null and attachmentUrl != ''">attachment_url = #{attachmentUrl},</if>
+            <if test="attachmentType != null">attachment_type = #{attachmentType},</if>
+            <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="fileSuffix != null and fileSuffix != ''">file_suffix = #{fileSuffix},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsOutsideAccommodationAttachmentById" parameterType="Long">
+        delete from dms_outside_accommodation_attachment where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsOutsideAccommodationAttachmentByIds" parameterType="String">
+        delete from dms_outside_accommodation_attachment where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java
index 03a67fc..94a307d 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzZzqApplyController.java
@@ -202,7 +202,7 @@ public class KnzzZzqApplyController extends BaseController {
     /**
      * 获取自治区人民政府奖学金详细信息
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:knzzZzqApply:query')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:knzzZzqApply:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取自治区人民政府奖学金详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java
index 111c85c..40e8702 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsKnrdApplyController.java
@@ -7,6 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.srs.common.annotation.NotNull;
 import com.srs.common.core.domain.model.LoginUser;
 import com.srs.common.utils.bean.BeanTrimmer;
@@ -44,8 +45,7 @@ import com.srs.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/knrdApply/apply")
-public class SrsKnrdApplyController extends BaseController
-{
+public class SrsKnrdApplyController extends BaseController {
     @Autowired
     private ISrsKnrdApplyService srsKnrdApplyService;
 
@@ -58,16 +58,16 @@ public class SrsKnrdApplyController extends BaseController
 
     @GetMapping("/listJwc")
     @ApiOperation("查询学工下的学生申请的列表")
-    public TableDataInfo listJwc(CphSearch param){
-        boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
-        if(hasRole){
+    public TableDataInfo listJwc(CphSearch param) {
+        boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
+        if (hasRole) {
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("4");
             }
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
             return getDataTable(list);
-        }else{
+        } else {
             List<String> list = new ArrayList<>();
             return getDataTable(list);
         }
@@ -75,19 +75,19 @@ public class SrsKnrdApplyController extends BaseController
 
     @GetMapping("/listXw")
     @ApiOperation("查询学务下的学生申请的列表")
-    public TableDataInfo listXw(CphSearch param){
+    public TableDataInfo listXw(CphSearch param) {
 //        boolean hasRole = RoleBool.isXw(getUserId(),_postService);
         boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
-        if(ejxysj){
+        if (ejxysj) {
             param.setDeptId(getDeptId());
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("3");
             }
             param.setUserName(getUsername());
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
             return getDataTable(list);
-        }else{
+        } else {
             List<String> list = new ArrayList<>();
             return getDataTable(list);
         }
@@ -96,14 +96,14 @@ public class SrsKnrdApplyController extends BaseController
 
     @PostMapping("/countXw")
     @ApiOperation("查询学务下的学生申请的列表")
-    public AjaxResult countXw(CphSearch param){
+    public AjaxResult countXw(CphSearch param) {
         boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
-        if(ejxysj){
+        if (ejxysj) {
             param.setDeptId(getDeptId());
             param.setUserName(getUsername());
             List<SrsKnrdApply> list = srsKnrdApplyService.countXw(param);
             return AjaxResult.success(list);
-        }else{
+        } else {
             List<String> list = new ArrayList<>();
             return AjaxResult.success(list);
         }
@@ -111,17 +111,17 @@ public class SrsKnrdApplyController extends BaseController
 
     @GetMapping("/listFdy")
     @ApiOperation("查询辅导员下的学生申请的列表")
-    public TableDataInfo listFdy(CphSearch param){
-        boolean hasRole = RoleBool.isFdy(getUserId(),_postService);
-        if(hasRole){
+    public TableDataInfo listFdy(CphSearch param) {
+        boolean hasRole = RoleBool.isFdy(getUserId(), _postService);
+        if (hasRole) {
             param.setTNo(getUsername());
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("2");
             }
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
             return getDataTable(list);
-        }else{
+        } else {
             List<String> list = new ArrayList<>();
             return getDataTable(list);
         }
@@ -130,7 +130,7 @@ public class SrsKnrdApplyController extends BaseController
 
     @GetMapping("/listOwn")
     @ApiOperation("查询学生自己申请的列表")
-    public TableDataInfo listOwn(SrsKnrdApply srsKnrdApply){
+    public TableDataInfo listOwn(SrsKnrdApply srsKnrdApply) {
         String stuNo = getUsername();
         startPage();
         srsKnrdApply.setXh(stuNo);
@@ -139,7 +139,6 @@ public class SrsKnrdApplyController extends BaseController
     }
 
 
-
     /**
      * 查询困难认定列表
      */
@@ -156,8 +155,7 @@ public class SrsKnrdApplyController extends BaseController
      */
     @Log(title = "困难认定", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SrsKnrdApply srsKnrdApply)
-    {
+    public void export(HttpServletResponse response, SrsKnrdApply srsKnrdApply) {
         List<SrsKnrdApply> list = srsKnrdApplyService.selectSrsKnrdApplyList(srsKnrdApply);
         ExcelUtil<SrsKnrdApply> util = new ExcelUtil<SrsKnrdApply>(SrsKnrdApply.class);
         util.exportExcel(response, list, "困难认定数据");
@@ -167,29 +165,26 @@ public class SrsKnrdApplyController extends BaseController
      * 获取困难认定详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         SrsKnrdApply srsKnrdApply = srsKnrdApplyService.selectSrsKnrdApplyById(id);
         boolean isStu = RoleBool.isStu(getUserId(), _roleService);
-        if(isStu){
+        if (isStu) {
             String stuNo = getUsername();
-            if(srsKnrdApply.getXh().equals(stuNo)){
+            if (srsKnrdApply.getXh().equals(stuNo)) {
                 return success(srsKnrdApply);
-            }
-            else{
+            } else {
                 return error("无权访问");
             }
-        }else{
+        } else {
             return success(srsKnrdApply);
         }
 
 
-
     }
+
     //获取当前学年
     @PostMapping(value = "/findByXhAndApplyYear")
-    public AjaxResult findByXhAndApplyYear(@RequestBody SrsKnrdApply srsKnrdApply)
-    {
+    public AjaxResult findByXhAndApplyYear(@RequestBody SrsKnrdApply srsKnrdApply) {
 
         return success(srsKnrdApplyService.selectByXhAndYear(srsKnrdApply));
     }
@@ -197,60 +192,60 @@ public class SrsKnrdApplyController extends BaseController
 
     @Autowired
     private TokenService tokenService;
-    @GetMapping( "/xh")
-    public AjaxResult getInfoxh(HttpServletRequest request)
-    {
+
+    @GetMapping("/xh")
+    public AjaxResult getInfoxh(HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
         return success(srsKnrdApplyService.getInfoxh(loginUser.getUser().getUserName()));
     }
-    @GetMapping( "/getStuByXh")
-    public AjaxResult getStuByXh(String xh)
-    {
+
+    @GetMapping("/getStuByXh")
+    public AjaxResult getStuByXh(String xh) {
         SrsStudent infoxh = srsKnrdApplyService.getInfoxh(xh);
-        if(infoxh==null){
-            return  error("学号错误，没有这个学生");
+        if (infoxh == null) {
+            return error("学号错误，没有这个学生");
         }
 
         return success();
     }
+
     /**
      * 新增困难认定
      */
     @Log(title = "学生新增困难认定", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SrsKnrdApply srsKnrdApply)
-    {
+    public AjaxResult add(@RequestBody SrsKnrdApply srsKnrdApply) {
         BeanTrimmer.trimFields(srsKnrdApply);
         return srsKnrdApplyService.insertSrsKnrdApply(srsKnrdApply);
     }
+
     /**
      * 修改困难认定
      */
     @Log(title = "困难认定", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody SrsKnrdApply srsKnrdApply)
-    {
+    public AjaxResult edit(@RequestBody SrsKnrdApply srsKnrdApply) {
         SrsKnrdApply result = srsKnrdApplyService.selectSrsKnrdApplyById(srsKnrdApply.getId());
         Long step = result.getStep();
-        if(step != 1 && step !=0){ //学生只能看不能操作
-            boolean isStudent = RoleBool.isStu(getUserId(),_roleService);
-            if(isStudent){
+        if (step != 1 && step != 0) { //学生只能看不能操作
+            boolean isStudent = RoleBool.isStu(getUserId(), _roleService);
+            if (isStudent) {
                 return AjaxResult.error("操作失败,权限不足!");
             }
-            if(step == 2) {
+            if (step == 2) {
                 boolean isFdy = RoleBool.isFdy(getUserId(), _postService);
                 if (!isFdy) {
                     return AjaxResult.error("操作失败,权限不足!");
                 }
             }
-            if(step == 3){
+            if (step == 3) {
                 boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
                 if (!ejxysj) {
                     return AjaxResult.error("操作失败,权限不足!");
                 }
             }
-            if(step == 4){
-                boolean isJwc = RoleBool.isJwc(getUserId(),_postService);
+            if (step == 4) {
+                boolean isJwc = RoleBool.isJwc(getUserId(), _postService);
                 if (!isJwc) {
                     return AjaxResult.error("操作失败,权限不足!");
                 }
@@ -260,24 +255,25 @@ public class SrsKnrdApplyController extends BaseController
         BeanTrimmer.trimFields(srsKnrdApply);
         return toAjax(srsKnrdApplyService.updateSrsKnrdApply(srsKnrdApply));
     }
+
     /**
      * 批量困难认定
      */
     @Log(title = "困难认定", businessType = BusinessType.UPDATE)
     @PostMapping("/updateAllSrsKnrdApply")
-    public AjaxResult updateAllSrsKnrdApply(@RequestBody SrsHandAllKnrd srsKnrdApply)
-    {
+    public AjaxResult updateAllSrsKnrdApply(@RequestBody SrsHandAllKnrd srsKnrdApply) {
         return toAjax(srsKnrdApplyService.updateAllSrsKnrdApply(srsKnrdApply));
     }
+
     /**
      * 删除困难认定
      */
     @Log(title = "困难认定", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(srsKnrdApplyService.deleteSrsKnrdApplyByIds(ids));
     }
+
     @Autowired
     private ISrsStudentService srsStudentService;
 
@@ -285,9 +281,10 @@ public class SrsKnrdApplyController extends BaseController
     private ICphStuExtraInfoService cphStuExtraInfoService;
     @Autowired
     private IRtStuDisciplinaryApplicationService rtStuDisciplinaryApplicationService;
+
     //学生基础信息校验
     @PostMapping("/infoCheck")
-    public AjaxResult infoCheck(){
+    public AjaxResult infoCheck() {
         AjaxResult ajaxResult = new AjaxResult();
 
         String stuNo = getUsername();
@@ -297,24 +294,24 @@ public class SrsKnrdApplyController extends BaseController
 
             check(res1);
             check(res2);
-            if(rtStuDisciplinaryApplicationService.selectRtStuDisciplinaryApplicationByStuNo(stuNo)){
-                Map map = new HashMap<String,String>();
-                map.put("code",1);
-                ajaxResult.put("code",0 );
-                ajaxResult.put("data",map);
-                ajaxResult.put("msg","你当前处于学校处分状态，不允许申请贫困生条件");
+            if (rtStuDisciplinaryApplicationService.selectRtStuDisciplinaryApplicationByStuNo(stuNo)) {
+                Map map = new HashMap<String, String>();
+                map.put("code", 1);
+                ajaxResult.put("code", 0);
+                ajaxResult.put("data", map);
+                ajaxResult.put("msg", "你当前处于学校处分状态，不允许申请贫困生条件");
                 return ajaxResult;
             }
 
-            ajaxResult.put("code",200);
+            ajaxResult.put("code", 200);
             return ajaxResult;
-        }catch (Exception e){
-            Map map = new HashMap<String,String>();
-            map.put("code",0);
-            map.put("info",e.getMessage());
-            ajaxResult.put("code",0);
-            ajaxResult.put("data",map);
-            ajaxResult.put("msg","请先填写完成个人信息中的重要信息和其他信息");
+        } catch (Exception e) {
+            Map map = new HashMap<String, String>();
+            map.put("code", 0);
+            map.put("info", e.getMessage());
+            ajaxResult.put("code", 0);
+            ajaxResult.put("data", map);
+            ajaxResult.put("msg", "请先填写完成个人信息中的重要信息和其他信息");
             return ajaxResult;
         }
 
@@ -324,17 +321,17 @@ public class SrsKnrdApplyController extends BaseController
         //获取所有字段
         final Class<?> clazz = obj.getClass();
         Field[] fields = clazz.getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             field.setAccessible(true);
             NotNull notNull = field.getAnnotation(NotNull.class);
 
             String name = field.getName();//字段名
             Type type = field.getGenericType();//字段类型
-            if(notNull != null){
+            if (notNull != null) {
 
                 Class<?> fieldClazz = field.getType();
                 Object fieldObj = field.get(obj);
-                if(field.get(obj) == null || "".equals(field.get(obj))){
+                if (field.get(obj) == null || "".equals(field.get(obj))) {
                     throw new Exception(notNull.value());
                 }
 //                //是数组
@@ -350,7 +347,7 @@ public class SrsKnrdApplyController extends BaseController
     }
 
     @PostMapping("/valid")
-    public AjaxResult valid(@RequestBody SrsKnrdApply apply){
+    public AjaxResult valid(@RequestBody SrsKnrdApply apply) {
         AjaxResult ajaxResult = new AjaxResult();
 //        SrsKnrdApply srsKnrdApply = new SrsKnrdApply();
         String stuNo = getUsername();
@@ -358,54 +355,54 @@ public class SrsKnrdApplyController extends BaseController
 //        SrsStuYear srsStuYear = srsStuYearService.listEnableYear().get(0);
 //        apply.setStuYearId(srsStuYear.getId());
         SrsKnrdApply vaildResult = srsKnrdApplyService.selectByXhAndYear(apply);
-        if(vaildResult == null ){
-            ajaxResult.put("valid",1);
-        }else{
-            ajaxResult.put("valid",0);
+        if (vaildResult == null) {
+            ajaxResult.put("valid", 1);
+        } else {
+            ajaxResult.put("valid", 0);
         }
         return ajaxResult;
     }
 
 
     @PostMapping("/fdySave")
-    public AjaxResult fdySave(@RequestBody SrsKnrdApply srsKnrdApply){
+    public AjaxResult fdySave(@RequestBody SrsKnrdApply srsKnrdApply) {
         int i = srsKnrdApplyService.fdySave(srsKnrdApply);
         return toAjax(i);
     }
 
 
     @PostMapping("/getCurrentYear")
-    public AjaxResult getCurrentYear(){
+    public AjaxResult getCurrentYear() {
         List<SrsStuYear> srsStuYears = srsStuYearService.listEnableYear();
         return success(srsStuYears.get(0));
     }
 
     @PostMapping("/reject")
-    public AjaxResult reject(@RequestBody SrsKnrdApprovalRecord record){
+    public AjaxResult reject(@RequestBody SrsKnrdApprovalRecord record) {
         return success(srsKnrdApplyService.reject(record));
     }
 
     @PostMapping("/jwcNext")
     @ApiOperation("查询学工下的学生申请的列表")
-    public AjaxResult jwcNext(CphSearch param){
+    public AjaxResult jwcNext(CphSearch param) {
 
-        boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
-        if(hasRole){
+        boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
+        if (hasRole) {
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("4");
             }
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 SrsKnrdApply srsKnrdApply = list.get(0);
                 //锁定
                 srsKnrdApplyService.lock(srsKnrdApply);
                 return AjaxResult.success(srsKnrdApply);
-            }else{
+            } else {
                 return AjaxResult.success(null);
             }
 
-        }else{
+        } else {
             return AjaxResult.success(null);
         }
     }
@@ -413,44 +410,45 @@ public class SrsKnrdApplyController extends BaseController
     @PostMapping("/fdyNext")
     @ApiOperation("查询学工下的学生申请的列表")
     public AjaxResult fdyNext(CphSearch param) {
-        boolean hasRole = RoleBool.isFdy(getUserId(),_postService);
-        if(hasRole){
+        boolean hasRole = RoleBool.isFdy(getUserId(), _postService);
+        if (hasRole) {
             param.setTNo(getUsername());
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("2");
             }
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 return AjaxResult.success(list.get(0));
-            }else{
+            } else {
                 return AjaxResult.success(null);
             }
 
-        }else{
+        } else {
 
             return AjaxResult.success(null);
         }
     }
+
     @PostMapping("/xwNext")
     @ApiOperation("查询学务下的学生申请的列表")
-    public AjaxResult xwNext(CphSearch param){
+    public AjaxResult xwNext(CphSearch param) {
 //        boolean hasRole = RoleBool.isXw(getUserId(),_postService);
         boolean ejxysj = RoleBool.isEjxysj(getUserId(), _postService);
-        if( ejxysj){
+        if (ejxysj) {
             param.setDeptId(getDeptId());
             startPage();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("3");
             }
             param.setUserName(getUsername());
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
-            if(list.size() != 0){
+            if (list.size() != 0) {
                 return AjaxResult.success(list.get(0));
-            }else{
+            } else {
                 return AjaxResult.success(null);
             }
-        }else{
+        } else {
             List<String> list = new ArrayList<>();
             return AjaxResult.success(null);
         }
@@ -460,10 +458,10 @@ public class SrsKnrdApplyController extends BaseController
     @ApiOperation("困难认定撤回")
     public AjaxResult revoke(@RequestBody SrsKnrdApply srsKnrdApply) {
         int revoke = srsKnrdApplyService.revoke(srsKnrdApply);
-        if(revoke > 0){
-            return  AjaxResult.success("操作成功！");
-        }else{
-            return  AjaxResult.error("操作失败！");
+        if (revoke > 0) {
+            return AjaxResult.success("操作成功！");
+        } else {
+            return AjaxResult.error("操作失败！");
         }
 
     }
@@ -473,10 +471,10 @@ public class SrsKnrdApplyController extends BaseController
     @ApiOperation("困难认定超级撤回")
     public AjaxResult fdyRevoke(@RequestBody SrsKnrdApply srsKnrdApply) {
         int revoke = srsKnrdApplyService.fdyRevoke(srsKnrdApply);
-        if(revoke > 0){
-            return  AjaxResult.success("操作成功！");
-        }else{
-            return  AjaxResult.error("操作失败！");
+        if (revoke > 0) {
+            return AjaxResult.success("操作成功！");
+        } else {
+            return AjaxResult.error("操作失败！");
         }
 
     }
@@ -484,10 +482,10 @@ public class SrsKnrdApplyController extends BaseController
     @PostMapping("/lock")
     public AjaxResult lock(@RequestBody SrsKnrdApply srsKnrdApply) {
         int lock = srsKnrdApplyService.lock(srsKnrdApply);
-        if(lock > 0){
-            return  AjaxResult.success("操作成功！");
-        }else{
-            return  AjaxResult.error("操作失败！");
+        if (lock > 0) {
+            return AjaxResult.success("操作成功！");
+        } else {
+            return AjaxResult.error("操作失败！");
         }
 
     }
@@ -495,10 +493,10 @@ public class SrsKnrdApplyController extends BaseController
     @PostMapping("/unlock")
     public AjaxResult unlock(@RequestBody SrsKnrdApply srsKnrdApply) {
         int unLock = srsKnrdApplyService.unlock(srsKnrdApply);
-        if(unLock > 0){
-            return  AjaxResult.success("操作成功！");
-        }else{
-            return  AjaxResult.error("操作失败！");
+        if (unLock > 0) {
+            return AjaxResult.success("操作成功！");
+        } else {
+            return AjaxResult.error("操作失败！");
         }
     }
 
@@ -506,24 +504,24 @@ public class SrsKnrdApplyController extends BaseController
     //教务处一键审核
     @PostMapping("/jwcUpdateAll")
     @ApiOperation("查询学工下的学生申请的列表")
-    public AjaxResult jwcUpdateAll(@RequestBody SrsHandAllKnrd srsKnrdApply){
-        boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
-        if(hasRole){
+    public AjaxResult jwcUpdateAll(@RequestBody SrsHandAllKnrd srsKnrdApply) {
+        boolean hasRole = RoleBool.isJwc(getUserId(), _postService);
+        if (hasRole) {
             CphSearch param = new CphSearch();
-            if (param.getStep()==null) {
+            if (param.getStep() == null) {
                 param.setStep("4");
             }
             List<SrsKnrdApply> list = srsKnrdApplyService.listView(param);
             int[] ids = new int[list.size()];
             for (int i = 0; i < list.size(); i++) {
-                ids[i] =  list.get(i).getId().intValue();
+                ids[i] = list.get(i).getId().intValue();
             }
             srsKnrdApply.setIds(ids);
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             String formatDate = format.format(new Date());
             srsKnrdApply.setXsqmrq(formatDate);
             return toAjax(srsKnrdApplyService.updateAllSrsKnrdApply(srsKnrdApply));
-        }else{
+        } else {
 
             return toAjax(0);
         }
@@ -531,11 +529,10 @@ public class SrsKnrdApplyController extends BaseController
 
     // 更新签名
     @PostMapping("/updateSignature")
-    public AjaxResult updateSignature(@RequestBody CphSearch cphSearch){
+    public AjaxResult updateSignature(@RequestBody CphSearch cphSearch) {
 
 
-
-        return  AjaxResult.success(srsKnrdApplyService.updateSignature(cphSearch));
+        return AjaxResult.success(srsKnrdApplyService.updateSignature(cphSearch));
     }
 }
 
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java
index 096e594..9ad4f75 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsMajorsController.java
@@ -28,7 +28,7 @@ import com.srs.common.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
- * 
+ *
  * @author srs
  * @date 2023-06-27
  */
@@ -124,4 +124,9 @@ public class SrsMajorsController extends BaseController
         return  AjaxResult.success(srsMajorsService.dataSync());
     }
 
+    @GetMapping("/getOwnMajorName")
+    public  AjaxResult getOwnMajorName(){
+        String stuNo = getUsername();
+        return AjaxResult.success(srsMajorsService.getOwnMajorName(stuNo));
+    }
 }
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java
index 49605b6..6841a29 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java
@@ -404,6 +404,12 @@ public class SrsStudentController extends BaseController {
     public AjaxResult getInfo(@PathVariable("stuId") Long stuId) {
         return success(srsStudentService.selectSrsStudentByStuId(stuId));
     }
+    //获取登陆学生信息
+    @GetMapping("/getLoginStudent")
+    public AjaxResult getLoginStudent() {
+        String stuNo = getUsername();
+        return success(srsStudentService.getSrsStudentByStuNoNew(stuNo));
+    }
 
     /**
      * 新增学生信息
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java
index 07855e8..beca00b 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsZxjApplyController.java
@@ -299,6 +299,16 @@ public class SrsZxjApplyController extends BaseController {
         return toAjax(i);
     }
 
+    @PostMapping("/updateSqly")
+    @ApiOperation("修改申请理由（sqly）")
+    public AjaxResult updateSqly(@RequestBody SrsZxjApply apply) {
+        if (apply == null || apply.getId() == null || apply.getSqly() == null) {
+            return AjaxResult.error("参数不完整");
+        }
+        int rows = srsZxjApplyService.updateSqly(apply.getId(), apply.getSqly());
+        return toAjax(rows);
+    }
+
 
     @PostMapping("/nopass")
     @ApiOperation("新增【贫困生申请】")
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java
index 243445a..14c76ef 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java
@@ -1,4 +1,4 @@
-package com.srs.comprehensive.controller;
+package com.srs.web.controller.comprehensive;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java
new file mode 100644
index 0000000..f69a1ed
--- /dev/null
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsAccommodationsController.java
@@ -0,0 +1,128 @@
+package com.srs.web.controller.dormitory;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.dormitory.domain.DmsAccommodations;
+import com.srs.dormitory.service.IDmsAccommodationsService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 外宿申请Controller
+ *
+ * @author srs
+ * @date 2025-11-11
+ */
+@RestController
+@RequestMapping("/dormitory/accommodations")
+@Api(value = "外宿申请管理", tags = "外宿申请管理")
+public class DmsAccommodationsController extends BaseController {
+    @Autowired
+    private IDmsAccommodationsService dmsAccommodationsService;
+
+    /**
+     * 查询外宿申请列表
+     */
+//@PreAuthorize("@ss.hasPermi('dormitory:accommodations:list')")
+@GetMapping("/list")
+@ApiOperation("查询外宿申请列表")
+    public TableDataInfo list(DmsAccommodations dmsAccommodations)
+    {
+        startPage();
+        String userName = getUsername();
+        if(dmsAccommodations==null) {
+            if (userName.equals("admin")) {
+                List<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
+                return getDataTable(list);
+            } else{
+                dmsAccommodations.setStuNo(userName);
+                List<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
+                return getDataTable(list);
+            }
+        }
+        else{
+            List<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 导出外宿申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:accommodations:export')")
+    @Log(title = "外宿申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出外宿申请列表")
+    public void export(HttpServletResponse response, DmsAccommodations dmsAccommodations)
+    {
+        List<DmsAccommodations> list = dmsAccommodationsService.selectDmsAccommodationsList(dmsAccommodations);
+        ExcelUtil<DmsAccommodations> util = new ExcelUtil<DmsAccommodations>(DmsAccommodations.class);
+        util.exportExcel(response, list, "外宿申请数据");
+    }
+
+    /**
+     * 获取外宿申请详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('dormitory:accommodations:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取外宿申请详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dmsAccommodationsService.selectDmsAccommodationsById(id));
+    }
+
+    /**
+     * 新增外宿申请
+     */
+//    @PreAuthorize("@ss.hasPermi('dormitory:accommodations:add')")
+    @Log(title = "外宿申请", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增外宿申请")
+    public AjaxResult add(@RequestBody DmsAccommodations dmsAccommodations)
+    {
+        return toAjax(dmsAccommodationsService.insertDmsAccommodations(dmsAccommodations));
+    }
+
+    /**
+     * 修改外宿申请
+     */
+   // @PreAuthorize("@ss.hasPermi('dormitory:accommodations:edit')")
+    @Log(title = "外宿申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改外宿申请")
+    public AjaxResult edit(@RequestBody DmsAccommodations dmsAccommodations)
+    {
+        return toAjax(dmsAccommodationsService.updateDmsAccommodations(dmsAccommodations));
+    }
+
+    /**
+     * 删除外宿申请
+     */
+   // @PreAuthorize("@ss.hasPermi('dormitory:accommodations:remove')")
+    @Log(title = "外宿申请", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除外宿申请")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dmsAccommodationsService.deleteDmsAccommodationsByIds(ids));
+    }
+    @GetMapping("/getStuDormitory")
+    public  AjaxResult getStuDormitory(){
+        String stuNo = getUsername();
+        return success(dmsAccommodationsService.getStuDormitory(stuNo));
+    }
+}
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java
new file mode 100644
index 0000000..2aa8c7f
--- /dev/null
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java
@@ -0,0 +1,120 @@
+package com.srs.web.controller.dormitory;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.srs.dormitory.service.IDmsOutsideAccommodationApplyService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 外宿申请Controller
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@RestController
+@RequestMapping("/dormitory/outsideAccommodationApply")
+@Api(value = "外宿申请管理", tags = "外宿申请管理")
+public class DmsOutsideAccommodationApplyController extends BaseController {
+    @Autowired
+    private IDmsOutsideAccommodationApplyService dmsOutsideAccommodationApplyService;
+
+    /**
+     * 查询外宿申请列表
+     */
+@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:list')")
+@GetMapping("/list")
+@ApiOperation("查询外宿申请列表")
+    public TableDataInfo list(DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        startPage();
+        List<DmsOutsideAccommodationApply> list = dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyList(dmsOutsideAccommodationApply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外宿申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:export')")
+    @Log(title = "外宿申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出外宿申请列表")
+    public void export(HttpServletResponse response, DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        List<DmsOutsideAccommodationApply> list = dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyList(dmsOutsideAccommodationApply);
+        ExcelUtil<DmsOutsideAccommodationApply> util = new ExcelUtil<DmsOutsideAccommodationApply>(DmsOutsideAccommodationApply.class);
+        util.exportExcel(response, list, "外宿申请数据");
+    }
+
+    /**
+     * 获取外宿申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取外宿申请详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyById(id));
+    }
+
+    /**
+     * 获取外宿申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:enlistmentReserve:query')")
+    @GetMapping(value = "/process/{processInstanceId}")
+    @ApiOperation("获取应征入伍保留学籍申请详细信息")
+    public AjaxResult getInfoByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId) {
+        return success(dmsOutsideAccommodationApplyService.selectDmsOutsideAccommodationApplyByProcessInstanceId(processInstanceId));
+    }
+
+    /**
+     * 新增外宿申请
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:add')")
+    @Log(title = "外宿申请", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增外宿申请")
+    public AjaxResult add(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        return success(dmsOutsideAccommodationApplyService.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
+    }
+
+    /**
+     * 修改外宿申请
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:edit')")
+    @Log(title = "外宿申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改外宿申请")
+    public AjaxResult edit(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        return toAjax(dmsOutsideAccommodationApplyService.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
+    }
+
+    /**
+     * 删除外宿申请
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:remove')")
+    @Log(title = "外宿申请", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除外宿申请")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dmsOutsideAccommodationApplyService.deleteDmsOutsideAccommodationApplyByIds(ids));
+    }
+}
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java
new file mode 100644
index 0000000..63c9d99
--- /dev/null
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java
@@ -0,0 +1,110 @@
+package com.srs.web.controller.dormitory;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.dormitory.domain.DmsOutsideAccommodationApproval;
+import com.srs.dormitory.service.IDmsOutsideAccommodationApprovalService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 外宿申请审批记录Controller
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@RestController
+@RequestMapping("/dormitory/outsideAccommodationApproval")
+@Api(value = "外宿申请审批记录管理", tags = "外宿申请审批记录管理")
+public class DmsOutsideAccommodationApprovalController extends BaseController {
+    @Autowired
+    private IDmsOutsideAccommodationApprovalService dmsOutsideAccommodationApprovalService;
+
+    /**
+     * 查询外宿申请审批记录列表
+     */
+@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
+@GetMapping("/list")
+@ApiOperation("查询外宿申请审批记录列表")
+    public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
+    {
+        startPage();
+        List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外宿申请审批记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:export')")
+    @Log(title = "外宿申请审批记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出外宿申请审批记录列表")
+    public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
+    {
+        List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
+        ExcelUtil<DmsOutsideAccommodationApproval> util = new ExcelUtil<DmsOutsideAccommodationApproval>(DmsOutsideAccommodationApproval.class);
+        util.exportExcel(response, list, "外宿申请审批记录数据");
+    }
+
+    /**
+     * 获取外宿申请审批记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取外宿申请审批记录详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalById(id));
+    }
+
+    /**
+     * 新增外宿申请审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:add')")
+    @Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增外宿申请审批记录")
+    public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
+    {
+        return toAjax(dmsOutsideAccommodationApprovalService.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
+    }
+
+    /**
+     * 修改外宿申请审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:edit')")
+    @Log(title = "外宿申请审批记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改外宿申请审批记录")
+    public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
+    {
+        return toAjax(dmsOutsideAccommodationApprovalService.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
+    }
+
+    /**
+     * 删除外宿申请审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:remove')")
+    @Log(title = "外宿申请审批记录", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除外宿申请审批记录")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dmsOutsideAccommodationApprovalService.deleteDmsOutsideAccommodationApprovalByIds(ids));
+    }
+}
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationAttachmentController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationAttachmentController.java
new file mode 100644
index 0000000..24ea031
--- /dev/null
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationAttachmentController.java
@@ -0,0 +1,110 @@
+package com.srs.web.controller.dormitory;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
+import com.srs.dormitory.service.IDmsOutsideAccommodationAttachmentService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 外宿申请附件Controller
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@RestController
+@RequestMapping("/dormitory/outsideAccommodationAttachment")
+@Api(value = "外宿申请附件管理", tags = "外宿申请附件管理")
+public class DmsOutsideAccommodationAttachmentController extends BaseController {
+    @Autowired
+    private IDmsOutsideAccommodationAttachmentService dmsOutsideAccommodationAttachmentService;
+
+    /**
+     * 查询外宿申请附件列表
+     */
+@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')")
+@GetMapping("/list")
+@ApiOperation("查询外宿申请附件列表")
+    public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
+    {
+        startPage();
+        List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外宿申请附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:export')")
+    @Log(title = "外宿申请附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出外宿申请附件列表")
+    public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
+    {
+        List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
+        ExcelUtil<DmsOutsideAccommodationAttachment> util = new ExcelUtil<DmsOutsideAccommodationAttachment>(DmsOutsideAccommodationAttachment.class);
+        util.exportExcel(response, list, "外宿申请附件数据");
+    }
+
+    /**
+     * 获取外宿申请附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取外宿申请附件详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentById(id));
+    }
+
+    /**
+     * 新增外宿申请附件
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:add')")
+    @Log(title = "外宿申请附件", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增外宿申请附件")
+    public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
+    {
+        return toAjax(dmsOutsideAccommodationAttachmentService.insertDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
+    }
+
+    /**
+     * 修改外宿申请附件
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:edit')")
+    @Log(title = "外宿申请附件", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改外宿申请附件")
+    public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
+    {
+        return toAjax(dmsOutsideAccommodationAttachmentService.updateDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
+    }
+
+    /**
+     * 删除外宿申请附件
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:remove')")
+    @Log(title = "外宿申请附件", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除外宿申请附件")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dmsOutsideAccommodationAttachmentService.deleteDmsOutsideAccommodationAttachmentByIds(ids));
+    }
+}
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java
index 6c3e207..746513a 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java
@@ -181,6 +181,9 @@ public class SrsDormitoryStudentController extends BaseController {
             if (hasRole) {
                 DomInfo dorm = _dormService.getDormHas(dto.getDormitoryId());
                 SrsStudent stu = _stuService.getStuInfo(dto.getStuNo());
+                if (stu == null) {
+                    return AjaxResult.error("学号不存在");
+                }
                 QueryWrapper<SrsDormitoryStudent> query = new QueryWrapper<>();
                 query.eq("stu_no", dto.getStuNo());
                 SrsDormitoryStudent find = srsDormitoryStudentService.getOne(query);
@@ -229,6 +232,9 @@ public class SrsDormitoryStudentController extends BaseController {
     public AjaxResult addCheckInInformation(@RequestBody StudentDormitoryDto dto) {
         DomInfo dorm = _dormService.getDormHas(dto.getDormitoryId());
         SrsStudent stu = _stuService.getStuInfo(dto.getStuNo());
+        if (stu == null) {
+            return AjaxResult.error("学号不存在");
+        }
         QueryWrapper<SrsDormitoryStudent> query = new QueryWrapper<>();
         query.eq("stu_no", dto.getStuNo());
         SrsDormitoryStudent find = srsDormitoryStudentService.getOne(query);
@@ -331,7 +337,8 @@ public class SrsDormitoryStudentController extends BaseController {
     @PostMapping("/update")
     public AjaxResult update(@RequestBody StudentDormitoryDto studentDormitoryDto) {
         SrsDormitoryStudent dormitoryStudent = new SrsDormitoryStudent();
-        if(studentDormitoryDto.getIsInStudentsleep().equals("否")||studentDormitoryDto.getIsInStudentsleep().equals("外宿")||studentDormitoryDto.getIsInStudentsleep().equals("外出实习")){
+        String sleep = studentDormitoryDto.getIsInStudentsleep();
+        if("否".equals(sleep) || "外宿".equals(sleep) || "外出实习".equals(sleep)){
             dormitoryStudent.setId(studentDormitoryDto.getId());
             dormitoryStudent.setDormitoryId(null);
             dormitoryStudent.setBedId(null);
@@ -339,9 +346,13 @@ public class SrsDormitoryStudentController extends BaseController {
             dormitoryStudent.setIsDormitoryHead(0);
             dormitoryStudent.setStatus(0);
             dormitoryStudent.setCheckinTime(null);
-            dormitoryStudent.setIsInStudentsleep(studentDormitoryDto.getIsInStudentsleep());
+            dormitoryStudent.setIsInStudentsleep(sleep);
         }else{
-            dormitoryStudent.setCheckinTime(studentDormitoryDto.getCheckinTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+            if (studentDormitoryDto.getCheckinTime() != null) {
+                dormitoryStudent.setCheckinTime(studentDormitoryDto.getCheckinTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+            } else {
+                dormitoryStudent.setCheckinTime(null);
+            }
             BeanUtils.copyProperties(studentDormitoryDto, dormitoryStudent);
         }
         //boolean b = srsDormitoryStudentService.updateById(dormitoryStudent);
diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
index 6808230..669acb8 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
@@ -3,6 +3,7 @@ package com.srs.web.controller.routine;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -112,4 +113,29 @@ public class RtEnlistmentReserveController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(rtEnlistmentReserveService.deleteRtEnlistmentReserveByIds(ids));
     }
+
+
+    /**
+     * 新增外宿申请
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:add')")
+    @Log(title = "外宿申请", businessType = BusinessType.INSERT)
+    @PostMapping("/outsideAccommodationApply/add")
+    @ApiOperation("新增外宿申请")
+    public AjaxResult add(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        return success(rtEnlistmentReserveService.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
+    }
+
+    /**
+     * 修改外宿申请
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:edit')")
+    @Log(title = "外宿申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/outsideAccommodationApply/update")
+    @ApiOperation("修改外宿申请")
+    public AjaxResult edit(@RequestBody DmsOutsideAccommodationApply dmsOutsideAccommodationApply)
+    {
+        return toAjax(rtEnlistmentReserveService.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply));
+    }
 }
diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/SysDisBasicController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/SysDisBasicController.java
index 22f1ec5..24d05a7 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/routine/SysDisBasicController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/routine/SysDisBasicController.java
@@ -1,8 +1,20 @@
 package com.srs.web.controller.routine;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.srs.common.utils.poi.ExcelExp;
+import com.srs.common.utils.poi.ExcelUtilManySheet;
+import com.srs.routine.domain.SysDisMate;
+import com.srs.routine.domain.dto.SysDisBasicDao;
+import com.srs.routine.domain.dto.SysDisMateDao;
+import com.srs.teacher.domain.SysPerformance;
+import com.srs.teacher.domain.SysTeacherThesis;
+import com.srs.teacher.domain.dto.SysPerformanceDao;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,6 +46,9 @@ public class SysDisBasicController extends BaseController {
     @Autowired
     private ISysDisBasicService sysDisBasicService;
 
+    @Value("${srs.url}")
+    private String baseUrl;
+
     /**
      * 查询退伍复学申请列表
      */
@@ -54,11 +69,61 @@ public class SysDisBasicController extends BaseController {
     @Log(title = "退伍复学申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出退伍复学申请列表")
-    public void export(HttpServletResponse response, SysDisBasic sysDisBasic)
-    {
+    public void export(HttpServletResponse response, SysDisBasic sysDisBasic) throws IOException {
         List<SysDisBasic> list = sysDisBasicService.selectSysDisBasicList(sysDisBasic);
-        ExcelUtil<SysDisBasic> util = new ExcelUtil<SysDisBasic>(SysDisBasic.class);
-        util.exportExcel(response, list, "退伍复学申请数据");
+//      基础材料
+        List<SysDisBasicDao> sysDisBasicDaos = new ArrayList<>();
+//        转专业
+        List<SysDisMateDao> sysDisMateDaos = new ArrayList<>();
+
+//        基础材料
+        for (SysDisBasic item : list){
+            SysDisBasicDao dao = new SysDisBasicDao();
+            dao.setStId(item.getStId());
+            dao.setStName(item.getStName());
+            dao.setCollege(item.getCollege());
+            dao.setSex(item.getSex());
+            dao.setNations(item.getNations());
+            dao.setStClass(item.getStClass());
+            dao.setMajors(item.getMajors());
+            dao.setGrade(item.getGrade());
+            dao.setCollege(item.getCollege());
+            dao.setReasons(item.getReasons());
+            dao.setConversion(item.getConversion());
+
+
+            sysDisBasicDaos.add(dao);
+        }
+
+//        转专业材料
+        for(SysDisBasic item :list){
+            SysDisMateDao dao1 = new SysDisMateDao();
+            dao1.setStId(item.getStId());
+            dao1.setStName(item.getStName());
+            dao1.setCollege(item.getCollege());
+            for (SysDisMate mate : item.getMaList()){
+                dao1.setOldgrade(mate.getOldgrade());
+                dao1.setOldmajor(mate.getOldmajor());
+                dao1.setNewgrade(mate.getNewgrade());
+                dao1.setNewmajor(mate.getNewmajor());
+                dao1.setProof(baseUrl.substring(0,baseUrl.length()-1) + mate.getProof());
+                dao1.setIdcard(baseUrl.substring(0,baseUrl.length()-1) + mate.getIdcard());
+                dao1.setMaterial(baseUrl.substring(0,baseUrl.length()-1) + mate.getMaterial());
+            }
+            sysDisMateDaos.add(dao1);
+        }
+
+        ExcelExp e1 = new ExcelExp("基础材料", sysDisBasicDaos, SysDisBasicDao.class);
+        ExcelExp e2 = new ExcelExp("转专业材料", sysDisMateDaos, SysDisMateDao.class);
+        List<ExcelExp> mysheet = new ArrayList<ExcelExp>();
+        mysheet.add(e1);
+        mysheet.add(e2);
+        ExcelUtilManySheet<List<SysDisBasic>> util2 = new ExcelUtilManySheet<List<SysDisBasic>>(mysheet);
+        util2.exportExcelManySheet(response, mysheet);
+
+//        ExcelUtil<SysDisBasic> util = new ExcelUtil<SysDisBasic>(SysDisBasic.class);
+//        util.exportExcel(response, list, "退伍复学申请数据");
+
     }
 
     /**
@@ -72,6 +137,23 @@ public class SysDisBasicController extends BaseController {
         return success(sysDisBasicService.selectSysDisBasicById(id));
     }
 
+//    根据学号查询信息
+    @PreAuthorize("@ss.hasPermi('routine:basic:query')")
+    @GetMapping(value = "/name/{stName}")
+    public AjaxResult getStNameInfo(@PathVariable("stName") String stName)
+    {
+        return success(sysDisBasicService.selectSysDisBasicByStName(stName));
+    }
+
+//    根据流程ID查询流程信息
+//    selectSysDisBasicByProcessInstanceId
+    @PreAuthorize("@ss.hasPermi('routine:basic:query')")
+    @GetMapping(value = "/processId/{processId}")
+    public AjaxResult getProcessId(@PathVariable("processId") String processId)
+    {
+        return success(sysDisBasicService.selectSysDisBasicByProcessInstanceId(processId));
+    }
+
     /**
      * 新增退伍复学申请
      */
diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml
index e874272..efab106 100644
--- a/srs-admin/src/main/resources/application.yml
+++ b/srs-admin/src/main/resources/application.yml
@@ -15,7 +15,7 @@ srs:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
-  url: http://zhxg:gxsdxy.cn/srs/prod_api/
+  url: https://zhxg.gxsdxy.cn/srs/prod_api/
 
 
 # 开发环境配置
@@ -81,15 +81,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-#    host: localhost     #正式环境redis
-    host: 47.112.118.149 #测试开发地址
+    host: localhost     #正式环境redis
+#    host: 47.112.118.149 #测试开发地址
 #     端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码SSSS
-    password: Houpuyfb   #测试开发密码
-#    password:       #正式环境密码
+#    password: Houpuyfb   #测试开发密码
+    password:       #正式环境密码
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -180,15 +180,15 @@ app:
   casEnable: false
   server:
     host:
-      url: http://zhxgjava.gxsdxy.cn
+      url: https://zhxgjava.gxsdxy.cn
   #应用登录地址
   login_url: /
   #应用登出地址
   logout_url: /logout
   #前端登录地址
-  web_url: http://zhxg.gxsdxy.cn/cas/#/index
+  web_url: https://zhxg.gxsdxy.cn/cas/#/index
   #移动端登录地址
-  wab_url: http://zhxg.gxsdxy.cn/wab/#/pages/index/index
+  wab_url: https://zhxg.gxsdxy.cn/wab/
 wechat:
   corpId: wx129e6bf0f36b8b3d
   secret: qoNhKNJc2vCeV0700u5d0F7wLFX2U_uUx3YC1PYuwL0
diff --git a/srs-common/src/main/java/com/srs/common/utils/WeChatUtil.java b/srs-common/src/main/java/com/srs/common/utils/WeChatUtil.java
index b94a681..a6eaa5b 100644
--- a/srs-common/src/main/java/com/srs/common/utils/WeChatUtil.java
+++ b/srs-common/src/main/java/com/srs/common/utils/WeChatUtil.java
@@ -175,4 +175,33 @@ public class WeChatUtil {
             throw new RuntimeException("请求发送消息出错", e);
         }
     }
+
+    /**
+     * 发送企业微信 Markdown 消息
+     * @param toUser 接收用户，'|' 分隔
+     * @param markdown Markdown 内容
+     */
+    public void sendMarkdownMessage(String toUser, String markdown) {
+        String accessToken = getAccessToken();
+        String url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=" + accessToken;
+
+        JSONObject msg = new JSONObject();
+        msg.put("touser", toUser);
+        msg.put("msgtype", "markdown");
+        msg.put("agentid", weChatConfig.getAgentId());
+
+        JSONObject md = new JSONObject();
+        md.put("content", markdown);
+        msg.put("markdown", md);
+
+        try {
+            String response = restTemplate.postForObject(url, msg, String.class);
+            JSONObject jsonResponse = JSONObject.parseObject(response);
+            if (jsonResponse.getIntValue("errcode") != 0) {
+                throw new RuntimeException("发送Markdown消息失败: " + jsonResponse.getString("errmsg"));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("请求发送Markdown消息出错", e);
+        }
+    }
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java
index 0c18418..bdda339 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java
@@ -80,6 +80,8 @@ public class SrsStudent extends BaseEntity
     })
     @TableField(exist = false)
     private SysDept dept;
+    @TableField(exist = false)
+    private  String deptName;
     @Excel(name = "年级")
     @TableField(exist = false)
     private  String gradeName;
@@ -114,7 +116,10 @@ public class SrsStudent extends BaseEntity
     @TableField(exist = false)
 //    @NotNull("家庭地址")
     private String address;
-
+    @TableField(exist = false)
+    private  String stuYearName;
+    @TableField(exist = false)
+    private  String needMoney;
 
     /** 状态（0正常 */
     @Excel(name = "状态",
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java
index c57a7d2..f6e2f5f 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java
@@ -23,7 +23,7 @@ public interface SrsMajorsMapper extends EasyBaseMapper<SrsMajors>
      * @return 【请填写功能名称】
      */
     public SrsMajors selectSrsMajorsByMajorId(Long majorId);
-
+    public SrsMajors getOwnMajorName(String stuNo);
     //根据专业名获取专业id
     public Long getMajorIdByName(String name);
     /**
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java
index 94c46de..4b95355 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java
@@ -68,11 +68,12 @@ public interface SrsStudentMapper extends EasyBaseMapper<SrsStudent>
     /**
      * 通过学号查询信息
      *
-     * @param stuNO 学号
+     * @param stuNo 学号
      * @return 学生信息
      */
-    public SrsStudent selectSrsStudentByStuNo(String stuNO);
+    public SrsStudent selectSrsStudentByStuNo(String stuNo);
 
+    public SrsStudent selectSrsStudentByStuNoNew(String stuNo);
     /**
      *  连表查询
      *
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java
index d1092cd..b766564 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import com.srs.comprehensive.domain.SrsZxjApply;
 import com.srs.comprehensive.domain.Vo.CphSearch;
 
@@ -107,4 +108,9 @@ public interface SrsZxjApplyMapper extends BaseMapper<SrsZxjApply> {
     int updateFdySignature(CphSearch cphSearch);
     int updateEjxySignature(CphSearch cphSearch);
     int updateScSignature(CphSearch cphSearch);
+
+    /**
+     * 仅更新申请理由（sqly）
+     */
+    int updateSqly(@Param("id") Long id, @Param("sqly") String sqly);
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
index 19645a9..8d157c8 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
@@ -70,4 +70,7 @@ public interface ISrsMajorsService
     void sqlserverSynchronousMYSQL(List<Map> list);
     //根据专业名称获取专业id
     public Long getMajorIdByName(String name);
+    //获取学生的专业名称
+    public  SrsMajors getOwnMajorName(String stuNo);
+
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java
index bda1f3d..04410a4 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java
@@ -43,7 +43,9 @@ public interface ISrsStudentService extends IService<SrsStudent>
     List<StuCount> countGoodBiyeGradeStu();
 
     List<StuCount> countDeptGradeStu();
+
     List<StuCount> countDeptStu();
+
     public AjaxResult changeStuInfo( SrsStudent param);
 
     public SrsStudent getStuInfo(String stuNo);
@@ -56,9 +58,14 @@ public interface ISrsStudentService extends IService<SrsStudent>
      */
     public SrsStudent  selectSrsStudentByStuId(Long stuId);
 
+    public  SrsStudent getSrsStudentByStuNo(String stuNo);
+
+    public  SrsStudent getSrsStudentByStuNoNew(String stuNo);
+
     public List<SrsStudent> listEnableStu();
 
     public StuClass getOwnClass(String stuNo);
+
     public  List<StuStatus> statusList();
 
     /**
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java
index 09fd3ec..2502b8e 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsZxjApplyService.java
@@ -95,4 +95,9 @@ public interface ISrsZxjApplyService extends IService<SrsZxjApply> {
     List<SrsZxjApply> countXw(CphSearch param);
 
     int updateSignature(CphSearch cphSearch);
+
+    /**
+     * 仅更新申请理由（sqly）
+     */
+    int updateSqly(Long id, String sqly);
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java
index 768646f..66984c6 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java
@@ -47,9 +47,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
             if(!Objects.equals(apply.getStuNo(), getUsername())){
                 throw new Exception("只能重新申请自己的申请");
             }
-            if(!Objects.equals(apply.getApplyStatus(), "10")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getApplyStatus(), "10")){
+//                throw new Exception("申请已处理");
+//            }
             UpdateWrapper<KnzzTufaApply> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("id", apply.getId())
                     // 需要重置的审批流程相关字段
@@ -225,9 +225,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
             if(!Objects.equals(apply.getStuNo(), getUsername())){
                 throw new Exception("只能取消自己的申请");
             }
-            if(!Objects.equals(apply.getApplyStatus(), "1")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getApplyStatus(), "1")){
+//                throw new Exception("申请已处理");
+//            }
             int res = knzzTufaApplyMapper.deleteById(id);
             if(res == 0){
                 throw new Exception("取消失败");
@@ -248,13 +248,13 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
                 throw new Exception("申请不存在");
             }
 
-            if(!Objects.equals(apply.getStuNo(), getUsername())){
-                throw new Exception("只能修改自己的申请");
-            }
+            // if(!Objects.equals(apply.getStuNo(), getUsername())){
+            //     throw new Exception("只能修改自己的申请");
+            // }
 
-            if(!Objects.equals(apply.getApplyStatus(), "1")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getApplyStatus(), "1")){
+//                throw new Exception("申请已处理");
+//            }
 
             apply.helpHis = param.helpHis;
             apply.yearMoney = param.yearMoney;
@@ -263,6 +263,15 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
             apply.applyReason = param.applyReason;
             apply.applySign = param.applySign;
             apply.hardFile = param.hardFile;
+            apply.bankCard = param.bankCard;
+            apply.jthk = param.jthk;
+            apply.hardCondition = param.hardCondition;
+            apply.familyAddr = param.familyAddr;
+            apply.postCode = param.postCode;
+            // 家庭成员列表不在辅导员修改范围，保留原值
+            if (param.applyStatus != null && !param.applyStatus.isEmpty()) {
+                apply.applyStatus = param.applyStatus;
+            }
 
             apply.setUpdateTime(getNowDate());
             apply.setUpdateBy(getUsername());
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java
index aef24e8..2c84fe8 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java
@@ -142,13 +142,13 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
                 throw new Exception("申请不存在");
             }
 
-            if(!Objects.equals(apply.getStuNo(), getUsername())){
-                throw new Exception("只能修改自己的申请");
-            }
-
-            if(!Objects.equals(apply.getApplyStatus(), "1")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getStuNo(), getUsername())){
+//                throw new Exception("只能修改自己的申请");
+//            }
+//
+//            if(!Objects.equals(apply.getApplyStatus(), "1")){
+//                throw new Exception("申请已处理");
+//            }
             apply.setBankCard(param.getBankCard());
             apply.setBankAddr(param.getBankAddr());
             apply.setStuPhone(param.getStuPhone());
@@ -167,6 +167,7 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
             apply.setUpdateTime(getNowDate());
             apply.setUpdateBy(getUsername());
             apply.setDiplomaCertificate(param.getDiplomaCertificate());
+            apply.setApplyStatus(param.getApplyStatus());
             int res = knzzZsgApplyMapper.updateById(apply);
             if(res == 0){
                 throw new Exception("修改失败");
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java
index f4d6ad3..adaafb5 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java
@@ -156,13 +156,13 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl<KnzzZzqApplyMapper,Knzz
                 throw new Exception("申请不存在");
             }
 
-            if(!Objects.equals(apply.getStuNo(), getUsername())){
-                throw new Exception("只能修改自己的申请");
-            }
-
-            if(!Objects.equals(apply.getApplyStatus(), "1")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getStuNo(), getUsername())){
+//                throw new Exception("只能修改自己的申请");
+//            }
+//
+//            if(!Objects.equals(apply.getApplyStatus(), "1")){
+//                throw new Exception("申请已处理");
+//            }
 
             apply.inTime = param.inTime;
             apply.helpHis = param.helpHis;
@@ -176,6 +176,7 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl<KnzzZzqApplyMapper,Knzz
             apply.applyReason = param.applyReason;
             apply.applyFile = param.applyFile;
             apply.applySign = param.applySign;
+            apply.applyStatus = param.applyStatus;
 
             apply.setUpdateTime(getNowDate());
             apply.setUpdateBy(getUsername());
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java
index 7ae16e9..1052b26 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java
@@ -1,28 +1,30 @@
 package com.srs.comprehensive.service.impl;
 
-import java.util.Calendar;
+import static com.srs.common.utils.SecurityUtils.getUserId;
+
 import java.util.Date;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.common.core.domain.entity.SysUser;
 import com.srs.common.core.domain.model.LoginUser;
 import com.srs.common.utils.SecurityUtils;
-import com.srs.comprehensive.domain.*;
+import com.srs.comprehensive.domain.SrsFemilyMenber;
 import com.srs.comprehensive.domain.SrsHandAllKnrd;
+import com.srs.comprehensive.domain.SrsKnrdApply;
+import com.srs.comprehensive.domain.SrsKnrdApprovalRecord;
+import com.srs.comprehensive.domain.SrsStuYear;
+import com.srs.comprehensive.domain.SrsStudent;
 import com.srs.comprehensive.domain.Vo.CphSearch;
+import com.srs.comprehensive.mapper.SrsKnrdApplyMapper;
 import com.srs.comprehensive.mapper.SrsKnrdApprovalRecordMapper;
 import com.srs.comprehensive.mapper.SrsStuYearMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-import com.srs.comprehensive.mapper.SrsKnrdApplyMapper;
 import com.srs.comprehensive.service.ISrsKnrdApplyService;
-import org.springframework.transaction.annotation.Transactional;
-
-
-import static com.srs.common.utils.SecurityUtils.getUserId;
-import static com.srs.common.utils.SecurityUtils.getUsername;
 
 /**
  * 困难认定Service业务层处理
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
index f5bb357..81ae353 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
@@ -53,6 +53,10 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
     {
         return srsMajorsMapper.selectSrsMajorsByMajorId(majorId);
     }
+    @Override
+    public  SrsMajors getOwnMajorName(String  stuNo){
+        return  srsMajorsMapper.getOwnMajorName(stuNo);
+    }
    @Override
    public Long getMajorIdByName(String name){
        return srsMajorsMapper.getMajorIdByName(name);
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java
index 5e5ddd5..ffc2a0e 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java
@@ -276,6 +276,9 @@ public class SrsStudentServiceImpl extends ServiceImpl<SrsStudentMapper, SrsStud
                 .last("limit 1");
         //SrsStudent stu = srsStudentMapper.selectOne(queryWrapper);
         SrsStudent stu = srsStudentMapper.selectSrsStudentByStuNo(stuNo);
+        if(stu == null){
+            return null;
+        }
         if(stu.getClassId() != null){
             SrsClass srsClass = srsClassMapper.selectById(stu.getClassId());
             if(srsClass != null){
@@ -320,7 +323,16 @@ public class SrsStudentServiceImpl extends ServiceImpl<SrsStudentMapper, SrsStud
     {
         return srsStudentMapper.selectSrsStudentByStuId(stuId);
     }
-
+    @Override
+    public SrsStudent getSrsStudentByStuNo(String stuNo)
+    {
+        return srsStudentMapper.selectSrsStudentByStuNo(stuNo);
+    }
+    @Override
+    public SrsStudent getSrsStudentByStuNoNew(String stuNo)
+    {
+        return srsStudentMapper.selectSrsStudentByStuNoNew(stuNo);
+    }
     @Override
     public StuClass getOwnClass(String stuNo){
         List<StuClass> res =  srsStudentMapper.getOwnClass(stuNo);
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsZxjApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsZxjApplyServiceImpl.java
index 012871b..ea77bf5 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsZxjApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsZxjApplyServiceImpl.java
@@ -334,4 +334,9 @@ public class SrsZxjApplyServiceImpl extends ServiceImpl<SrsZxjApplyMapper, SrsZx
         return (row1 + row2 + row3 + row4);
     }
 
+    @Override
+    public int updateSqly(Long id, String sqly) {
+        return srsZxjApplyMapper.updateSqly(id, sqly);
+    }
+
 }
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
index 6eb6d1e..98b9708 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
@@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join view_stu_info as b on a.stu_no = b.stu_no
                  left join srs_stu_year as c on a.stu_year_id = c.id
                  left join cph_teacher as d on a.fdy_no = d.employee_id
-                 left join qgzx_teacher as e on a.dept_no = d.employee_id
+                left join qgzx_teacher as e on a.dept_no = e.employee_id
                  left join qgzx_teacher as f on a.xg_no = f.employee_id
                  left join qgzx_teacher as g on a.leader_no = g.employee_id
         <where>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
index e1618ae..0bc4f90 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
@@ -192,7 +192,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectSrsKnrdApplyVo">
-        select * from srs_knrd_apply
+        select t.knrd_type as knlx, a.*
+        from srs_knrd_apply as a
+        left join srs_knrd_type as t
+          on t.stu_no = a.xh
+         and t.stu_year_id = a.stu_year_id
     </sql>
 
     <select id="selectSrsKnrdApplyList" parameterType="SrsKnrdApply" resultMap="SrsKnrdApplyResult">
@@ -247,11 +251,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSrsKnrdApplyById" parameterType="Long" resultMap="SrsKnrdApplyResult">
         <include refid="selectSrsKnrdApplyVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
     <select id="selectSrsKnrdApplyBysfz" resultType="com.srs.comprehensive.domain.SrsKnrdApply">
         <include refid="selectSrsKnrdApplyVo"/>
-        where sfzhm = #{sfzhm} and stu_year_id = #{stuYearId}
+        where a.sfzhm = #{sfzhm} and a.stu_year_id = #{stuYearId}
     </select>
     <select id="selectsfzhm" resultType="com.srs.comprehensive.domain.SrsKnrdApply">
         select * from srs_student where id_card=#{sfzhm}
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml
index 3191fb7..86b61d9 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsMajorsMapper.xml
@@ -176,4 +176,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join sys_dept as b on a.old_dept_id = b.dept_id
         where b.dept_name = #{deptName}
     </select>
+    <select id="getOwnMajorName" resultType="com.srs.comprehensive.domain.SrsMajors" parameterType="String">
+        select c.major_name
+        from srs_student a left join srs_class b on a.class_id=b.class_id
+        left join srs_majors c on a.major_id=c.major_id
+        where a.stu_no=#{stuNo}
+    </select>
 </mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
index 7a58159..6e197b9 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
@@ -28,6 +28,7 @@
         <result property="cphName" column="cphName"/>
         <result property="gradeName" column="grade_name"/>
         <result property="status2" column="status2"/>
+        <result property="deptName" column="dept_name" />
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <association property="srsMajors" column="major_id" javaType="srsMajors" resultMap="SrsMajorsResult"/>
         <association property="srsClass" column="class_id" javaType="srsClass" resultMap="SrsClassResult"/>
@@ -200,7 +201,7 @@
         <include refid="selectSrsStudentJoin"/>
         where stu_id = #{stuId}
     </select>
-    <select id="selectSrsStudentByStuNo" parameterType="string" resultMap="SrsStudentResult">
+    <select id="selectSrsStudentByStuNo" parameterType="String" resultMap="SrsStudentResult">
         <include refid="selectSrsStudentVo"/>
         where stu_no = #{stuNo}
     </select>
@@ -729,7 +730,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id
@@ -749,7 +750,7 @@
         order by grade_code desc
     </select>
     <select id="getSchoolTotalCount" resultType="java.util.Map">
-        SELECT COUNT(1)                                                                               AS TotalCount,
+        SELECT COUNT(1)                                                                              AS TotalCount,
                SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END)                                         AS NaCount,
                SUM(CASE WHEN gender = '女' THEN 1 ELSE 0 END)                                         AS NvCount,
                CONCAT(ROUND(SUM(CASE WHEN gender = '男' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2), '%') AS NaZB,
@@ -781,7 +782,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id
@@ -790,7 +791,7 @@
         where c.city is null
     </select>
     <select id="getMajorsCount" resultType="java.util.Map">
-        select d.dept_name                                                      as deptName,
+        select d.dept_name                                                    as deptName,
                count(case when year (CURDATE())-f.grade_code=1 then '大一' end) as firstCount,
                count(case when year (CURDATE())-f.grade_code=2 then '大二' end) as thirdCount,
                count(case when year (CURDATE())-f.grade_code=3 then '大三' end) as secondCount
@@ -821,4 +822,37 @@
         from sys_dict_data
         where dict_type = 'srs_stu_status'
     </select>
+    <select id="selectSrsStudentByStuNoNew" parameterType="String" resultType="com.srs.comprehensive.domain.SrsStudent">
+        select s.stu_id,
+               s.stu_no,
+               s.name,
+               s.gender,
+               s.birthday,
+               AES_DECRYPT(UNHEX(s.id_card), 'zhxg') as id_card,
+               s.dept_id,
+               m.major_id,
+               c.class_id,
+               s.phone,
+               s.address,
+               s.status,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               s.del_flag,
+               s.xhk,
+               s.bank_addr,
+               d.dept_name,
+               f.grade_name,
+               h.stu_year_name,
+               g.need_money
+        from srs_student s
+                 left join srs_class c on s.class_id = c.class_id
+                 left join srs_majors m on c.major_id = m.major_id
+                 left join sys_dept d on m.college_id = d.dept_id
+                 left join srs_grade as f on f.grade_id = c.grade_id
+                 left join dms_new_record g on s.stu_no=g.stu_no
+                 left join srs_stu_year h on g.stu_year_id=h.id
+        where s.stu_no = #{stuNo}
+    </select>
 </mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
index d9cb126..46f1054 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
@@ -75,79 +75,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSrsZxjApplyVo">
-        select id, step, xm, xb, mz, zzmm, xh, rxsj, csny, dh, nj, xy, zy, bj, kndj, knlx, knlx2, rkzs, yzsr, rjyr, srly, jtcy, sqly, fdyqm, fdyqmrq, ejxyldqm, ejxyldqmrq, xsqm, xsqmrq, csdj, zzdj, zzls, zp,affix_id,status1,status2,status3,dz,yb,xxyjrq,apply_year,locked,level,
-       EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = srs_zxj_apply.xh and (penalty_status = 0 or  penalty_status = 2)) as penalty_status0,
-       EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = srs_zxj_apply.xh and (penalty_status = 1 )) as penalty_status1,
-       EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = srs_zxj_apply.xh and (penalty_status = 3 )) as penalty_status3,
-        sfzhm,
-        gyhd,
-        bankCard,
-        bankAddr,
-       rjnsr,
-       bjyj,
-       bjyjdj,
-        ejxyyj,
-        ejxyyjdj,
-        xxyj,
-        xxqm,
-               stu_year_id,fdygh,fdymc,ejxyldmc,ejxyldgh,xxmc,xxgh
-
-
-        from srs_zxj_apply
-
+        select a.id, a.step, a.xm, a.xb, a.mz, a.zzmm, a.xh, a.rxsj, a.csny, a.dh, a.nj, a.xy, a.zy, a.bj, a.kndj,
+               t.knrd_type as knlx,
+               a.knlx2, a.rkzs, a.yzsr, a.rjyr, a.srly, a.jtcy, a.sqly, a.fdyqm, a.fdyqmrq, a.ejxyldqm, a.ejxyldqmrq,
+               a.xsqm, a.xsqmrq, a.csdj, a.zzdj, a.zzls, a.zp, a.affix_id, a.status1, a.status2, a.status3, a.dz, a.yb,
+               a.xxyjrq, a.apply_year, a.locked, a.level,
+               EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 0 or  penalty_status = 2)) as penalty_status0,
+               EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 1 )) as penalty_status1,
+               EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 3 )) as penalty_status3,
+               a.sfzhm,
+               a.gyhd,
+               a.bankCard,
+               a.bankAddr,
+               a.rjnsr,
+               a.bjyj,
+               a.bjyjdj,
+               a.ejxyyj,
+               a.ejxyyjdj,
+               a.xxyj,
+               a.xxqm,
+               a.stu_year_id, a.fdygh, a.fdymc, a.ejxyldmc, a.ejxyldgh, a.xxmc, a.xxgh
+        from srs_zxj_apply as a
+        left join srs_knrd_type as t
+          on t.stu_no = a.xh
+         and t.stu_year_id = a.stu_year_id
     </sql>
 
     <select id="selectSrsZxjApplyList" parameterType="SrsZxjApply" resultMap="SrsZxjApplyResult">
         <include refid="selectSrsZxjApplyVo"/>
         <where>
-            <if test="step != null "> and step = #{step}</if>
-            <if test="xm != null  and xm != ''"> and xm = #{xm}</if>
-            <if test="xb != null  and xb != ''"> and xb = #{xb}</if>
-            <if test="mz != null  and mz != ''"> and mz = #{mz}</if>
-            <if test="zzmm != null  and zzmm != ''"> and zzmm = #{zzmm}</if>
-            <if test="xh != null  and xh != ''"> and xh = #{xh}</if>
-            <if test="rxsj != null  and rxsj != ''"> and rxsj = #{rxsj}</if>
-            <if test="csny != null  and csny != ''"> and csny = #{csny}</if>
-            <if test="dh != null  and dh != ''"> and dh = #{dh}</if>
-            <if test="nj != null  and nj != ''"> and nj = #{nj}</if>
-            <if test="xy != null  and xy != ''"> and xy = #{xy}</if>
-            <if test="zy != null  and zy != ''"> and zy = #{zy}</if>
-            <if test="bj != null  and bj != ''"> and bj = #{bj}</if>
-            <if test="kndj != null  and kndj != ''"> and kndj = #{kndj}</if>
-            <if test="knlx != null  and knlx != ''"> and knlx = #{knlx}</if>
-            <if test="knlx2 != null  and knlx2 != ''"> and knlx2 = #{knlx2}</if>
-            <if test="rkzs != null  and rkzs != ''"> and rkzs = #{rkzs}</if>
-            <if test="yzsr != null  and yzsr != ''"> and yzsr = #{yzsr}</if>
-            <if test="rjyr != null  and rjyr != ''"> and rjyr = #{rjyr}</if>
-            <if test="srly != null  and srly != ''"> and srly = #{srly}</if>
-            <if test="jtcy != null  and jtcy != ''"> and jtcy = #{jtcy}</if>
-            <if test="sqly != null  and sqly != ''"> and sqly = #{sqly}</if>
-            <if test="fdyqm != null  and fdyqm != ''"> and fdyqm = #{fdyqm}</if>
-            <if test="fdyqmrq != null  and fdyqmrq != ''"> and fdyqmrq = #{fdyqmrq}</if>
-            <if test="ejxyldqm != null  and ejxyldqm != ''"> and ejxyldqm = #{ejxyldqm}</if>
-            <if test="ejxyldqmrq != null  and ejxyldqmrq != ''"> and ejxyldqmrq = #{ejxyldqmrq}</if>
-            <if test="xsqm != null  and xsqm != ''"> and xsqm = #{xsqm}</if>
-            <if test="xsqmrq != null  and xsqmrq != ''"> and xsqmrq = #{xsqmrq}</if>
-            <if test="csdj != null  and csdj != ''"> and csdj = #{csdj}</if>
-            <if test="zzdj != null  and zzdj != ''"> and zzdj = #{zzdj}</if>
-            <if test="zzls != null  and zzls != ''"> and zzls = #{zzls}</if>
-            <if test="zp != null  and zp != ''"> and zp = #{zp}</if>
-            <if test="affixId != null  and affixId != ''"> and affix_id = #{affixId}</if>
-            <if test="status1 != null  and status1 != ''"> and status1 = #{status1}</if>
-            <if test="status2 != null  and status2 != ''"> and status2 = #{status2}</if>
-            <if test="status3 != null  and status3 != ''"> and status3 = #{status3}</if>
-            <if test="dz != null  and dz != ''"> and dz = #{dz}</if>
-            <if test="yb != null  and yb != ''"> and yb = #{yb}</if>
-            <if test="xxyjrq != null  and xxyjrq != ''"> and xxyjrq = #{xxyjrq}</if>
-            <if test="applyYear != null  and applyYear != ''"> and apply_year = #{applyYear}</if>
-            <if test="stuYearId != null  and stuYearId != ''"> and stu_year_id = #{stuYearId}</if>
+            <if test="step != null "> and a.step = #{step}</if>
+            <if test="xm != null  and xm != ''"> and a.xm = #{xm}</if>
+            <if test="xb != null  and xb != ''"> and a.xb = #{xb}</if>
+            <if test="mz != null  and mz != ''"> and a.mz = #{mz}</if>
+            <if test="zzmm != null  and zzmm != ''"> and a.zzmm = #{zzmm}</if>
+            <if test="xh != null  and xh != ''"> and a.xh = #{xh}</if>
+            <if test="rxsj != null  and rxsj != ''"> and a.rxsj = #{rxsj}</if>
+            <if test="csny != null  and csny != ''"> and a.csny = #{csny}</if>
+            <if test="dh != null  and dh != ''"> and a.dh = #{dh}</if>
+            <if test="nj != null  and nj != ''"> and a.nj = #{nj}</if>
+            <if test="xy != null  and xy != ''"> and a.xy = #{xy}</if>
+            <if test="zy != null  and zy != ''"> and a.zy = #{zy}</if>
+            <if test="bj != null  and bj != ''"> and a.bj = #{bj}</if>
+            <if test="kndj != null  and kndj != ''"> and a.kndj = #{kndj}</if>
+            <if test="knlx != null  and knlx != ''"> and t.knrd_type = #{knlx}</if>
+            <if test="knlx2 != null  and knlx2 != ''"> and a.knlx2 = #{knlx2}</if>
+            <if test="rkzs != null  and rkzs != ''"> and a.rkzs = #{rkzs}</if>
+            <if test="yzsr != null  and yzsr != ''"> and a.yzsr = #{yzsr}</if>
+            <if test="rjyr != null  and rjyr != ''"> and a.rjyr = #{rjyr}</if>
+            <if test="srly != null  and srly != ''"> and a.srly = #{srly}</if>
+            <if test="jtcy != null  and jtcy != ''"> and a.jtcy = #{jtcy}</if>
+            <if test="sqly != null  and sqly != ''"> and a.sqly = #{sqly}</if>
+            <if test="fdyqm != null  and fdyqm != ''"> and a.fdyqm = #{fdyqm}</if>
+            <if test="fdyqmrq != null  and fdyqmrq != ''"> and a.fdyqmrq = #{fdyqmrq}</if>
+            <if test="ejxyldqm != null  and ejxyldqm != ''"> and a.ejxyldqm = #{ejxyldqm}</if>
+            <if test="ejxyldqmrq != null  and ejxyldqmrq != ''"> and a.ejxyldqmrq = #{ejxyldqmrq}</if>
+            <if test="xsqm != null  and xsqm != ''"> and a.xsqm = #{xsqm}</if>
+            <if test="xsqmrq != null  and xsqmrq != ''"> and a.xsqmrq = #{xsqmrq}</if>
+            <if test="csdj != null  and csdj != ''"> and a.csdj = #{csdj}</if>
+            <if test="zzdj != null  and zzdj != ''"> and a.zzdj = #{zzdj}</if>
+            <if test="zzls != null  and zzls != ''"> and a.zzls = #{zzls}</if>
+            <if test="zp != null  and zp != ''"> and a.zp = #{zp}</if>
+            <if test="affixId != null  and affixId != ''"> and a.affix_id = #{affixId}</if>
+            <if test="status1 != null  and status1 != ''"> and a.status1 = #{status1}</if>
+            <if test="status2 != null  and status2 != ''"> and a.status2 = #{status2}</if>
+            <if test="status3 != null  and status3 != ''"> and a.status3 = #{status3}</if>
+            <if test="dz != null  and dz != ''"> and a.dz = #{dz}</if>
+            <if test="yb != null  and yb != ''"> and a.yb = #{yb}</if>
+            <if test="xxyjrq != null  and xxyjrq != ''"> and a.xxyjrq = #{xxyjrq}</if>
+            <if test="applyYear != null  and applyYear != ''"> and a.apply_year = #{applyYear}</if>
+            <if test="stuYearId != null  and stuYearId != ''"> and a.stu_year_id = #{stuYearId}</if>
         </where>
     </select>
 
     <select id="selectSrsZxjApplyById" parameterType="Long" resultMap="SrsZxjApplyResult">
         <include refid="selectSrsZxjApplyVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
+
+    <!-- 仅更新申请理由（sqly） -->
+    <update id="updateSqly">
+        update srs_zxj_apply
+        set sqly = #{sqly}
+        where id = #{id}
+    </update>
 <!--    获取下一个未审批的-->
     <select id="nextApply" parameterType="CphSearch" resultMap="SrsZxjApplyResult">
         select a.*
@@ -245,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.zy as zy,
         a.bj as bj,
         a.kndj as kndj,
-        a.knlx as knlx,
+        t.knrd_type as knlx,
         a.knlx2 as knlx2,
         a.rkzs as rkzs,
         a.yzsr as yzsr,
@@ -291,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join srs_class as c on b.class_id = c.class_id
         left join srs_majors as d on c.major_id = d.major_id
         left join cph_teacher as e on c.teacher_id = e.teacher_id
+        left join srs_knrd_type as t on t.stu_no = a.xh and t.stu_year_id = a.stu_year_id
         left join (
         SELECT * FROM (
         SELECT *,
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
index 85e32c4..262e14b 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         right join srs_zxj_approval_record as r on r.apply_id = a.id
         where
             r.step != 0 and r.step != 1
+            and a.step != 0
             <if test="step != null "> and r.step = #{step}</if>
             <if test="tNo != null "> and e.employee_id = #{tNo}</if>
             <if test="deptId != null "> and d.college_id = #{deptId}</if>
diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApply.java b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApply.java
new file mode 100644
index 0000000..b426748
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApply.java
@@ -0,0 +1,356 @@
+package com.srs.flowable.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.srs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.Date;
+
+
+/**
+ * 外宿申请对象 dms_outside_accommodation_apply
+ *
+ * @author srs
+ * @date 2025-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsOutsideAccommodationApply对象", description = "外宿申请表")
+@TableName("dms_outside_accommodation_apply")
+public class OutsideAccommodationApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申请编号（唯一，如WS20240001）
+     */
+    @ApiModelProperty("申请编号（唯一，如WS20240001）")
+    @TableField("apply_no")
+    @Excel(name = "申请编号", readConverterExp = "唯=一，如WS20240001")
+    private String applyNo;
+
+    /**
+     * 学生ID（关联学生表）
+     */
+    @ApiModelProperty("学生ID（关联学生表）")
+    @TableField("student_id")
+    @Excel(name = "学生ID", readConverterExp = "关=联学生表")
+    private Long studentId;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @TableField("student_no")
+    @Excel(name = "学号")
+    private String studentNo;
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    @TableField("student_name")
+    @Excel(name = "学生姓名")
+    private String studentName;
+
+    /**
+     * 性别（男/女）
+     */
+    @ApiModelProperty("性别（男/女）")
+    @TableField("gender")
+    @Excel(name = "性别", readConverterExp = "男=/女")
+    private String gender;
+
+    /**
+     * 出生年月
+     */
+    @ApiModelProperty("出生年月")
+    @TableField("birth_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate;
+
+    /**
+     * 学院ID
+     */
+    @ApiModelProperty("学院ID")
+    @TableField("dept_id")
+    @Excel(name = "学院ID")
+    private Long deptId;
+
+    /**
+     * 学院名称
+     */
+    @ApiModelProperty("学院名称")
+    @TableField("dept_name")
+    @Excel(name = "学院名称")
+    private String deptName;
+
+    /**
+     * 专业ID
+     */
+    @ApiModelProperty("专业ID")
+    @TableField("major_id")
+    @Excel(name = "专业ID")
+    private Long majorId;
+
+    /**
+     * 专业名称
+     */
+    @ApiModelProperty("专业名称")
+    @TableField("major_name")
+    @Excel(name = "专业名称")
+    private String majorName;
+
+    /**
+     * 班级ID
+     */
+    @ApiModelProperty("班级ID")
+    @TableField("class_id")
+    @Excel(name = "班级ID")
+    private Long classId;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    @TableField("class_name")
+    @Excel(name = "班级名称")
+    private String className;
+
+    /**
+     * 原宿舍号（如：1栋302）
+     */
+    @ApiModelProperty("原宿舍号（如：1栋302）")
+    @TableField("original_dormitory")
+    @Excel(name = "原宿舍号", readConverterExp = "如=：1栋302")
+    private String originalDormitory;
+
+    /**
+     * 住宿费缴纳
+     */
+    @ApiModelProperty("住宿费缴纳")
+    @TableField("accommodation_fee")
+    @Excel(name = "住宿费缴纳")
+    private String accommodationFee;
+
+    /**
+     * 住宿费缴纳状态（1=已交，0=未交）
+     */
+    @ApiModelProperty("住宿费缴纳状态（1=已交，0=未交）")
+    @TableField("accommodation_fee_status")
+    @Excel(name = "住宿费缴纳状态", readConverterExp = "1==已交，0=未交")
+    private Long accommodationFeeStatus;
+
+    /**
+     * 外宿原因
+     */
+    @ApiModelProperty("外宿原因")
+    @TableField("apply_reason")
+    @Excel(name = "外宿原因")
+    private String applyReason;
+
+    /**
+     * 外宿详细地址（精确至门牌号）
+     */
+    @ApiModelProperty("外宿详细地址（精确至门牌号）")
+    @TableField("outside_address")
+    @Excel(name = "外宿详细地址", readConverterExp = "精=确至门牌号")
+    private String outsideAddress;
+
+    /**
+     * 外宿地址-省市区/县
+     */
+    @ApiModelProperty("外宿地址-省市区/县")
+    @TableField("address")
+    @Excel(name = "外宿地址-省市区/县")
+    private String address;
+
+    /**
+     * 紧急联系人电话
+     */
+    @ApiModelProperty("紧急联系人电话")
+    @TableField("emergency_phone")
+    @Excel(name = "紧急联系人电话")
+    private String emergencyPhone;
+
+    /**
+     * 外宿紧急联系人
+     */
+    @ApiModelProperty("外宿紧急联系人")
+    @TableField("emergency_contact")
+    @Excel(name = "外宿紧急联系人")
+    private String emergencyContact;
+
+    /**
+     * 家长意见（1=同意，0=不同意）
+     */
+    @ApiModelProperty("家长意见（1=同意，0=不同意）")
+    @TableField("parent_opinion")
+    @Excel(name = "家长意见", readConverterExp = "1==同意，0=不同意")
+    private Long parentOpinion;
+
+    /**
+     * 家长签字附件URL
+     */
+    @ApiModelProperty("家长签字附件URL")
+    @TableField("parent_sign_attachment")
+    @Excel(name = "家长签字附件URL")
+    private String parentSignAttachment;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty("家长联系电话")
+    @TableField("parent_phone")
+    @Excel(name = "家长联系电话")
+    private String parentPhone;
+
+    /**
+     * 家长通讯地址-省市区/县
+     */
+    @ApiModelProperty("家长通讯地址-省市区/县")
+    @TableField("parent_address")
+    @Excel(name = "家长通讯地址-省市区/县")
+    private String parentAddress;
+
+    /**
+     * 家长通讯地址-详细地址
+     */
+    @ApiModelProperty("家长通讯地址-详细地址")
+    @TableField("parent_detail_address")
+    @Excel(name = "家长通讯地址-详细地址")
+    private String parentDetailAddress;
+
+    /**
+     * 学生承诺电子签URL
+     */
+    @ApiModelProperty("学生承诺电子签URL")
+    @TableField("student_promise_sign")
+    @Excel(name = "学生承诺电子签URL")
+    private String studentPromiseSign;
+
+    /**
+     * 承诺签署日期
+     */
+    @ApiModelProperty("承诺签署日期")
+    @TableField("promise_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "承诺签署日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date promiseDate;
+
+    /**
+     * 外宿开始时间
+     */
+    @ApiModelProperty("外宿开始时间")
+    @TableField("start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "外宿开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 外宿结束时间（默认次年8月31日）
+     */
+    @ApiModelProperty("外宿结束时间（默认次年8月31日）")
+    @TableField("end_date")
+    @Excel(name = "外宿结束时间", readConverterExp = "默=认次年8月31日")
+    private Date endDate;
+
+    /**
+     * 申请状态（0=草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回）
+     */
+    @ApiModelProperty("申请状态（0=草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回）")
+    @TableField("status")
+    @Excel(name = "申请状态", readConverterExp = "0==草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回")
+    private Long status;
+
+    /**
+     * 驳回原因
+     */
+    @ApiModelProperty("驳回原因")
+    @TableField("reject_reason")
+    @Excel(name = "驳回原因")
+    private String rejectReason;
+
+    /**
+     * 是否有效（1=有效，0=失效/到期）
+     */
+    @ApiModelProperty("是否有效（1=有效，0=失效/到期）")
+    @TableField("is_valid")
+    @Excel(name = "是否有效", readConverterExp = "1==有效，0=失效/到期")
+    private Long isValid;
+
+    /**
+     * 辅导员姓名
+     */
+    @ApiModelProperty("辅导员姓名")
+    @TableField("teacher_name")
+    @Excel(name = "辅导员姓名")
+    private String teacherName;
+
+    /**
+     * 附件id
+     */
+    @ApiModelProperty("附件id")
+    @TableField("affix_id")
+    @Excel(name = "附件id")
+    private String affixId;
+
+    /**
+     * 流程部署编号
+     */
+    @ApiModelProperty("流程部署编号")
+    @TableField("deploy_id")
+    @Excel(name = "流程部署编号")
+    private String deployId;
+
+    /**
+     * Flowable流程实例ID
+     */
+    @ApiModelProperty("Flowable流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "Flowable流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 身份证号码
+     */
+    @ApiModelProperty("身份证号码")
+    @TableField("idCard")
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /**
+     * 学生手机号码
+     */
+    @ApiModelProperty("学生手机号码")
+    @TableField("studentPhone")
+    @Excel(name = "学生手机号码")
+    private String studentPhone;
+
+    /**
+     * 外宿原因学生签名URL
+     */
+    @ApiModelProperty("外宿原因学生签名URL")
+    @TableField("student_signature")
+    @Excel(name = "外宿原因学生签名URL")
+    private String studentSignature;
+
+
+}
diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java
new file mode 100644
index 0000000..dbadaab
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java
@@ -0,0 +1,139 @@
+package com.srs.flowable.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.srs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.Date;
+
+
+
+/**
+ * 外宿申请审批记录对象 dms_outside_accommodation_approval
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "DmsOutsideAccommodationApproval对象" , description = "外宿申请审批记录表")
+@TableName("dms_outside_accommodation_approval")
+public class OutsideAccommodationApproval extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 外宿申请ID（关联申请表）
+     */
+    @ApiModelProperty("外宿申请ID（关联申请表）")
+    @TableField("apply_id")
+    @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表")
+    private Long applyId;
+
+    /**
+     * 申请编号
+     */
+    @ApiModelProperty("申请编号")
+    @TableField("apply_no")
+    @Excel(name = "申请编号")
+    private String applyNo;
+
+    /**
+     * 审批节点
+     */
+    @ApiModelProperty("审批节点")
+    @TableField("approval_node")
+    @Excel(name = "审批节点")
+    private String approvalNode;
+
+    /**
+     * 审批人ID
+     */
+    @ApiModelProperty("审批人ID")
+    @TableField("approver_id")
+    @Excel(name = "审批人ID")
+    private Long approverId;
+
+    /**
+     * 审批人姓名
+     */
+    @ApiModelProperty("审批人姓名")
+    @TableField("approver_name")
+    @Excel(name = "审批人姓名")
+    private String approverName;
+
+    /**
+     * 审批人角色
+     */
+    @ApiModelProperty("审批人角色")
+    @TableField("approver_role")
+    @Excel(name = "审批人角色")
+    private String approverRole;
+
+    /**
+     * 审批意见
+     */
+    @ApiModelProperty("审批意见")
+    @TableField("approval_opinion")
+    @Excel(name = "审批意见")
+    private String approvalOpinion;
+
+    /**
+     * 审批结果（1=同意，0=驳回）
+     */
+    @ApiModelProperty("审批结果（1=同意，0=驳回）")
+    @TableField("approval_result")
+    @Excel(name = "审批结果" , readConverterExp = "1==同意，0=驳回")
+    private Long approvalResult;
+
+    /**
+     * 审批时间
+     */
+    @ApiModelProperty("审批时间")
+    @TableField("approval_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvalTime;
+
+    /**
+     * 流程实例ID
+     */
+    @ApiModelProperty("流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    @TableField("student_name")
+    @Excel(name = "学生姓名")
+    private String studentName;
+
+    /**
+     * 学生学号
+     */
+    @ApiModelProperty("学生学号")
+    @TableField("student_no")
+    @Excel(name = "学生学号")
+    private String studentNo;
+
+
+}
diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/vo/FlowQueryVo.java b/srs-flowable/src/main/java/com/srs/flowable/domain/vo/FlowQueryVo.java
index 645403c..e5ce179 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/domain/vo/FlowQueryVo.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/domain/vo/FlowQueryVo.java
@@ -17,6 +17,12 @@ public class FlowQueryVo {
     @ApiModelProperty("流程名称")
     private String name;
 
+    @ApiModelProperty("流程发起人名称")
+    private String startUserName;
+
+    @ApiModelProperty("提交时间(yyyy-MM-dd)")
+    private String deployTime;
+
     @ApiModelProperty("开始时间")
     private String startTime;
 
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java
index 629d6bf..667fc7b 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java
@@ -80,7 +80,7 @@ public class BoStartListener implements ExecutionListener {
                     WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                     // 构造包含超链接的消息内容
-                    String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                    String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                     // 步骤 4: 使用 userName 作为接收人发送消息
                     //weChatUtil.sendTextMessage(userName, content);
@@ -122,7 +122,7 @@ public class BoStartListener implements ExecutionListener {
                     WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                     // 构造包含超链接的消息内容
-                    String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                    String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                     // 步骤 4: 使用 userName 作为接收人发送消息
                     weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java
index ca80054..8ee7108 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/CounselorListener.java
@@ -90,7 +90,7 @@ public class CounselorListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java
index e3b787d..049add6 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java
@@ -107,7 +107,9 @@ public class LeadAuditListener implements ExecutionListener {
                     //获取学工领导信息
                     String roleKey = "xgldsp"; //角色key
                     List<TeacherVo> xueDataInfo = leaveMapper.getShenDataInfo(roleKey);
-
+                    if (xueDataInfo == null || xueDataInfo.isEmpty()) {
+                        log.warn("未找到学工领导(roleKey={})信息，跳过该环节通知。", roleKey);
+                    } else {
                     //查询指定用户的通知信息
                     notificationManage.setContent("您有一条【二级学院书记已提交请假申请审批】需待处理"); // 消息内容
                     notificationManage.setReceiver(Long.parseLong(xueDataInfo.get(0).getUserId().toString())); //接收人需添加appvoval//185043
@@ -121,24 +123,28 @@ public class LeadAuditListener implements ExecutionListener {
                     //构建通知信息内容
                     notificationManage.setContent("您有一条【学工领导已提交请假申请审批】需待处理"); // 消息内容
                     notificationManage.setSender(Long.parseLong(approval)); // 发送方
+                    }
                 }
                 if(leaveDay >= 15 && leaveDay <= 30) {
                     //获取校领导信息
                     String roleKey = "xldsp"; //角色key
                     List<TeacherVo> lingDataInfo = leaveMapper.getShenDataInfo(roleKey);
+                    if (lingDataInfo == null || lingDataInfo.isEmpty()) {
+                        log.warn("未找到校领导(roleKey={})信息，跳过该环节通知。", roleKey);
+                    } else {
+                        notificationManage.setContent("您有一条【学工领导已提交请假申请审批】需待处理"); // 消息内容
+                        notificationManage.setReceiver(lingDataInfo.get(0).getUserId()); //接收人185362
+                        NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage);
+                        if(userManage != null) {
+                            //删除指定通知信息
+                            int delRes = leaveMapper.deleteCphMsgById(userManage.getId());
+                            log.info("删除成功{}", delRes);
+                        }
 
-                    notificationManage.setContent("您有一条【学工领导已提交请假申请审批】需待处理"); // 消息内容
-                    notificationManage.setReceiver(lingDataInfo.get(0).getUserId()); //接收人185362
-                    NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage);
-                    if(userManage != null) {
-                        //删除指定通知信息
-                        int delRes = leaveMapper.deleteCphMsgById(userManage.getId());
-                        log.info("删除成功{}", delRes);
+                        //构建通知信息内容
+                        notificationManage.setContent("您有一条【学院领导已提交请假申请审批】待处理"); // 消息内容
+                        notificationManage.setSender(lingDataInfo.get(0).getUserId()); // 发送方185362
                     }
-
-                    //构建通知信息内容
-                    notificationManage.setContent("您有一条【学院领导已提交请假申请审批】待处理"); // 消息内容
-                    notificationManage.setSender(lingDataInfo.get(0).getUserId()); // 发送方185362
                 }
                 notificationManage.setReceiver(shenUserInfo.getUserId());
                 notificationManage.setCreateTime(DateUtils.getNowDate());
@@ -149,7 +155,7 @@ public class LeadAuditListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java
index ca6b7b0..bd63085 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java
@@ -106,7 +106,7 @@ public class LeadEentListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java
index a596ad1..6ef63ef 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadStartListener.java
@@ -58,7 +58,7 @@ public class LeadStartListener implements ExecutionListener {
             if (userName != null && !userName.isEmpty()) {
                 //查询指定用户的通知信息
                 NotificationManage notificationManage = new NotificationManage();
-                notificationManage.setContent("您有一条【辅导员已提交请假审批】需待处理"); // 消息内容
+                notificationManage.setContent("您有一条【请假审批】待处理"); // 消息内容
                 notificationManage.setReceiver(Long.parseLong(approval));
                 NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage);
                 if(userManage != null) {
@@ -68,7 +68,7 @@ public class LeadStartListener implements ExecutionListener {
                 }
 
                 //向系统发送通知
-                notificationManage.setContent("您有一条【二级学院书记已提交请假申请审批】需待处理"); // 消息内容
+                notificationManage.setContent("您有一条【请假申请审批】待处理"); // 消息内容
                 notificationManage.setSender(Long.parseLong(approval)); // 发送方
                 notificationManage.setReceiver(updateDeptIdInfo.get(0).getUserId()); // 接收方
                 NotificationManage userManages = leaveMapper.selectCphMsgListForFlowable(notificationManage);
@@ -82,7 +82,7 @@ public class LeadStartListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java
index 5ca8a69..7cfb105 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java
@@ -105,7 +105,7 @@ public class LeaveApproveListener implements ExecutionListener {
                     WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                     // 构造包含超链接的消息内容
-                    String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                    String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                     // 步骤 4: 使用 userName 作为接收人发送消息
                     weChatUtil.sendTextMessage(userName, content); // 发送消息的方法
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java
index fa029db..bd41ead 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java
@@ -81,7 +81,7 @@ public class LeaveStartApproveListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java
index f64ca53..7f884e4 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/SecondaryLeaderListener.java
@@ -40,6 +40,11 @@ public class SecondaryLeaderListener implements ExecutionListener {
         //TeacherVo secondaryLeaderInfo = leaveMapper.getSecondaryLeaderInfo(deptId);
         //delegateExecution.setVariable("approval", secondaryLeaderInfo.getUserId());
         List<TeacherVo> secondaryLeaderInfo = leaveMapper.getSecondaryLeaderInfo(deptId);
+        // 空数据防护：未查询到二级学院书记信息则跳过设置与通知
+        if (secondaryLeaderInfo == null || secondaryLeaderInfo.isEmpty()) {
+            log.warn("未找到二级学院书记信息，deptId={}，跳过审批人设置与通知。", deptId);
+            return;
+        }
         //由于这里查到了多个数据，由于时间原因，暂时还没有研究到工作流中多用户节点的同时进行(所以取了第一条数据用于发消息)
         delegateExecution.setVariable("approval", secondaryLeaderInfo.get(0).getUserId());
 
@@ -85,7 +90,7 @@ public class SecondaryLeaderListener implements ExecutionListener {
 //                    WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 //
 //                    // 构造包含超链接的消息内容
-//                    String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+//                    String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 //
 //                    // 步骤 4: 使用 userName 作为接收人发送消息
 //                    //weChatUtil.sendTextMessage(userName, content);
@@ -117,7 +122,7 @@ public class SecondaryLeaderListener implements ExecutionListener {
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                 // 构造包含超链接的消息内容
-                String content = "您有待处理任务，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                String content = "您有待处理任务，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                 // 步骤 4: 使用 userName 作为接收人发送消息
                 weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/ArchivingNotifyListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/ArchivingNotifyListener.java
index edafa78..7e35415 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/ArchivingNotifyListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/ArchivingNotifyListener.java
@@ -60,7 +60,7 @@ public class ArchivingNotifyListener implements ExecutionListener {
             List<String> userNameList = disciplinaryMapper.getUserNamesByUserIdList(userIdList);
             if (userNameList != null && !userNameList.isEmpty()) {
                 String toUser = String.join("|", userNameList);
-                String weChatMessage = "您有一条新的学生违纪归档任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                String weChatMessage = "您有一条新的学生违纪归档任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
                 weChatUtil.sendTextMessage(toUser, weChatMessage);
                 log.info("已成功向归档角色 ({}) 发送企业微信通知。", ARCHIVING_ROLE_KEY);
             } else {
@@ -73,7 +73,7 @@ public class ArchivingNotifyListener implements ExecutionListener {
             String activityId = (nextElement != null) ? nextElement.getId() : "Activity_1agoizv"; // 节点的ID作为备用
 
             String messageText = "您有一条新的【" + taskName + "】待办任务需要处理。";
-            String link = "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+            String link = "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
             String hiddenIdentifier = String.format("<span id='flow-identifier' data-proc-inst-id='%s' data-activity-id='%s' style='display:none;'></span>",
                     execution.getProcessInstanceId(), activityId);
             String internalMessageContent = messageText + link + hiddenIdentifier;
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
index e1ceb03..ff408b1 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
@@ -39,7 +39,7 @@ public class EJXYSJListener implements ExecutionListener {
 
                     // 构造包含超链接的消息内容
                     String content = "您有一条新的学生违纪审批任务待处理，" +
-                            "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                            "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
                     // 步骤 4: 使用 userName 作为接收人发送消息
                     weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorNotificationListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorNotificationListener.java
index d496edb..7c067fb 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorNotificationListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorNotificationListener.java
@@ -50,12 +50,12 @@ public class InitiatorNotificationListener implements ExecutionListener {
 
         // --- 2. 准备通知内容 (解决taskName为空的问题) ---
         String nextTaskName = getNextTaskName(execution);
-        String weChatMessage = "您提交的学生违纪处分申请已有最终处理结果，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+        String weChatMessage = "您提交的学生违纪处分申请已有最终处理结果，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
         String internalMessageText = "您有一条新的【" + nextTaskName + "】待办任务需要处理。";
         String hiddenIdentifier = String.format("<span id='flow-identifier' data-proc-inst-id='%s' data-activity-id='%s' style='display:none;'></span>",
                 execution.getProcessInstanceId(),
                 ((SequenceFlow) execution.getCurrentFlowElement()).getTargetRef());
-        String internalMessageContent = internalMessageText + "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。" + hiddenIdentifier;
+        String internalMessageContent = internalMessageText + "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。" + hiddenIdentifier;
 
         // --- 3. 发送企业微信通知 ---
         sendWeChatNotification(initiatorUserId, weChatMessage);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorResultListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorResultListener.java
index 96594ba..243ddf8 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorResultListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/InitiatorResultListener.java
@@ -46,7 +46,7 @@ public class InitiatorResultListener implements ExecutionListener {
             if (initiatorUserName != null && !initiatorUserName.isEmpty()) {
                 // 4. 发送通知
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
-                String content = "您提交的学生违纪处分申请已有最终处理结果，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。\"";
+                String content = "您提交的学生违纪处分申请已有最终处理结果，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。\"";
 
                 weChatUtil.sendTextMessage(initiatorUserName, content);
                 log.info("已成功向流程发起人 ({}) 发送结果通知。", initiatorUserName);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/MultiInstanceMessageListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/MultiInstanceMessageListener.java
index db98f99..2e0f8f7 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/MultiInstanceMessageListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/MultiInstanceMessageListener.java
@@ -47,7 +47,7 @@ public class MultiInstanceMessageListener implements ExecutionListener {
 
         // --- 步骤 3: 准备消息内容 ---
         String messageText = "您有一条新的【" + taskName + "】待办任务需要处理。";
-        String link = "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+        String link = "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
         String hiddenIdentifier = String.format("<span id='flow-identifier' data-proc-inst-id='%s' data-activity-id='%s' style='display:none;'></span>",
                 execution.getProcessInstanceId(),
                 activityId);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/SchoolLeaderApprovalListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/SchoolLeaderApprovalListener.java
index 2f2cb07..48833bc 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/SchoolLeaderApprovalListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/SchoolLeaderApprovalListener.java
@@ -60,7 +60,7 @@ public class SchoolLeaderApprovalListener implements ExecutionListener {
             List<String> userNameList = disciplinaryMapper.getUserNamesByUserIdList(userIdList);
             if (userNameList != null && !userNameList.isEmpty()) {
                 String toUser = String.join("|", userNameList);
-                String weChatMessage = "校领导您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                String weChatMessage = "校领导您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
                 weChatUtil.sendTextMessage(toUser, weChatMessage);
                 log.info("已成功向校领导 (角色: {}) 发送企业微信通知。", LEADER_ROLE_KEY);
             }
@@ -71,7 +71,7 @@ public class SchoolLeaderApprovalListener implements ExecutionListener {
             String activityId = (nextElement != null) ? nextElement.getId() : "Activity_0ftj9eo";
 
             String messageText = "您有一条新的【" + taskName + "】待办任务需要处理。";
-            String link = "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+            String link = "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
             String hiddenIdentifier = String.format("<span id='flow-identifier' data-proc-inst-id='%s' data-activity-id='%s' style='display:none;'></span>",
                     execution.getProcessInstanceId(), activityId);
             String internalMessageContent = messageText + link + hiddenIdentifier;
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/StuInfoListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/StuInfoListener.java
index fc71688..bf6319f 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/StuInfoListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/StuInfoListener.java
@@ -106,7 +106,7 @@ public class StuInfoListener implements ExecutionListener {
 
 
             String messageText = "您有一条新的【" + taskName + "】待办任务需要处理。";
-            String link = "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+            String link = "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
             String hiddenIdentifier = String.format("<span id='flow-identifier' data-proc-inst-id='%s' data-activity-id='%s' style='display:none;'></span>",
                     execution.getProcessInstanceId(), activityId);
             String internalMessageContent = messageText + link + hiddenIdentifier;
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java
index b3fc036..dc34cf3 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/WSSListener.java
@@ -43,7 +43,7 @@ public class WSSListener implements ExecutionListener {
                 String toUser = String.join("|", userNameList);
 
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
-                String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                String content = "您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
 
                 weChatUtil.sendTextMessage(toUser, content);
                 log.info("已成功向角色 '{}' 的成员发送通知。接收人: {}", TARGET_ROLE_KEY, toUser);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XGLDSHListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XGLDSHListener.java
index 9b99b1f..bc04bd3 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XGLDSHListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XGLDSHListener.java
@@ -54,7 +54,7 @@ public class XGLDSHListener implements ExecutionListener {
 
             String toUser = String.join("|", userNameList);
             String content = "您有一条新的学生违纪审批任务待处理，" +
-                    "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
+                    "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>";
 
             weChatUtil.sendTextMessage(toUser, content);
             log.info("流程实例 [{}]: 已成功向角色 '{}' 成员发送企微通知，接收人: {}", processInstanceId, roleKey, toUser);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java
index b725545..c9c3437 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XLZXListener.java
@@ -43,7 +43,7 @@ public class XLZXListener  implements ExecutionListener {
                 String toUser = String.join("|", userNameList);
 
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
-                String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                String content = "您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
 
                 weChatUtil.sendTextMessage(toUser, content);
                 log.info("已成功向角色 '{}' 的成员发送通知。接收人: {}", TARGET_ROLE_KEY, toUser);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XSJYGLKListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XSJYGLKListener.java
index 507d513..2b227c1 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XSJYGLKListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XSJYGLKListener.java
@@ -58,7 +58,7 @@ public class XSJYGLKListener implements ExecutionListener {
                 String toUser = String.join("|", userNameList);
 
                 WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
-                String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                String content = "您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
 
                 weChatUtil.sendTextMessage(toUser, content);
                 log.info("已成功向角色 '{}' 的成员发送企业微信通知。接收人: {}", roleKey, toUser);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java
index a461d36..c42f901 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XWGSListener.java
@@ -45,7 +45,7 @@ public class XWGSListener implements ExecutionListener {
                         WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                         // 构造包含超链接的消息内容
-                        String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+                        String content = "您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
 
                         // 步骤 4: 使用 userName 作为接收人发送消息
                         weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XYWJCLWYHListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XYWJCLWYHListener.java
index e5fc810..97b0570 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XYWJCLWYHListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/XYWJCLWYHListener.java
@@ -62,7 +62,7 @@ public class XYWJCLWYHListener implements ExecutionListener {
                 return;
             }
             String toUser = String.join("|", userNameList);
-            String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
+            String content = "您有一条新的学生违纪审批任务待处理，<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>请点击前往处理</a>。";
             weChatUtil.sendTextMessage(toUser, content);
             log.info("流程实例 [{}]: 已成功向'委员会'发送企微通知。", processInstanceId);
         } catch (Exception e) {
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java
new file mode 100644
index 0000000..2c5a54d
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java
@@ -0,0 +1,139 @@
+package com.srs.flowable.listener.outsideAccommodation;
+
+
+import com.srs.common.utils.SecurityUtils;
+import com.srs.common.utils.spring.SpringUtils;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.srs.flowable.domain.EnlistmentReserve;
+import com.srs.flowable.domain.EnlistmentReserveApproval;
+import com.srs.flowable.domain.OutsideAccommodationApply;
+import com.srs.flowable.domain.OutsideAccommodationApproval;
+import com.srs.flowable.mapper.EnlistmentReserveApprovalMapper;
+import com.srs.flowable.mapper.EnlistmentReserveMapper;
+import com.srs.flowable.mapper.OutsideAccommodationApplyMapper;
+import com.srs.flowable.mapper.OutsideAccommodationApprovalMapper;
+import com.srs.system.service.ISysUserService;
+import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.bpmn.model.FlowNode;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+/**
+ * 审批流程负责人自动流转监听器
+ * 用于节点审批通过时，添加审批记录
+ */
+@Component("OutsideAccommodationEndListener") // Spring Bean名称，与BPMN表达式对应
+public class OutsideAccommodationEndListener implements ExecutionListener {
+
+    // 用于查询流程定义中的节点信息
+    @Autowired
+    private RepositoryService repositoryService;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        // 1. 获取当前节点ID和流程定义ID
+        String currentActivityId = execution.getCurrentActivityId(); // 当前节点ID（兼容所有版本）
+        String processDefinitionId = execution.getProcessDefinitionId(); // 流程定义ID
+
+        // 2. 根据节点ID查询节点名称（核心修正：通过流程定义获取名称）
+        String currentNodeName = getNodeNameByActivityId(processDefinitionId, currentActivityId);
+        if (currentNodeName == null) {
+            throw new RuntimeException("未找到节点ID=" + currentActivityId + "的名称");
+        }
+
+        // 获取申请表id
+        Long accommodationId = Long.valueOf(execution.getVariable("accommodationId").toString());
+
+        // 获取审核意见
+        String approvalOpinion = (String) execution.getVariable("approvalOpinion");
+
+        // 获取审核状态（兼容Integer/Long类型）
+        Object approvalResultObj = execution.getVariable("approvalResult");
+        Long approvalResult = null;
+        if (approvalResultObj != null) {
+            // 先转为数字，再获取long值
+            Number num = (Number) approvalResultObj;
+            approvalResult = num.longValue();
+        }
+
+
+        OutsideAccommodationApplyMapper outsideAccommodationApplyMapper = SpringUtils.getBean(OutsideAccommodationApplyMapper.class);
+        // 根据Id查询外宿申请记录
+        OutsideAccommodationApply outsideAccommodationApply = outsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyById(accommodationId);
+        // 添加审批记录
+        saveApprovalRecord(outsideAccommodationApply.getId(), outsideAccommodationApply.getProcessInstanceId(),outsideAccommodationApply.getApplyNo(),currentNodeName, outsideAccommodationApply.getStudentName(), outsideAccommodationApply.getStudentNo(), approvalOpinion, approvalResult);
+        Long status = 1L;
+        if (currentNodeName.equals("辅导员审批")) {
+            status = 2L;
+        }
+        if (currentNodeName.equals("二级学院书记审批")) {
+            status = 3L;
+        }
+        if (currentNodeName.equals("学工处审批")) {
+            status = 4L;
+        }
+        // 如果到了最后一个审批人，则修改申请表审核状态
+        if (currentNodeName.equals("学校领导审批")){
+            // 改变申请表中的审核状态（审核通过）
+            status = 5L;
+        }
+        outsideAccommodationApply.setStatus(status);
+        outsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(outsideAccommodationApply);
+    }
+
+    /**
+     * 根据节点ID和流程定义ID，查询节点名称（兼容所有版本的核心方法）
+     */
+    private String getNodeNameByActivityId(String processDefinitionId, String activityId) {
+        // 获取流程模型
+        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+        if (bpmnModel == null) {
+            throw new RuntimeException("未找到流程定义ID=" + processDefinitionId + "的模型");
+        }
+
+        // 从模型中获取节点信息（FlowNode包含用户任务、网关等节点）
+        FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(activityId);
+        return flowNode != null ? flowNode.getName() : null;
+    }
+
+    /**
+     * 通用审批记录保存方法
+     */
+    private void saveApprovalRecord(Long ApplyId,String processInstanceId, String applyNo, String nodeName, String studentName, String studentNo, String approvalOpinion, Long approvalResult) {
+        OutsideAccommodationApproval outsideAccommodationApproval = new OutsideAccommodationApproval();
+        // 赋值
+        outsideAccommodationApproval.setApplyId(ApplyId);
+        outsideAccommodationApproval.setProcessInstanceId(processInstanceId);
+        outsideAccommodationApproval.setApplyNo(applyNo);
+        outsideAccommodationApproval.setApprovalNode(nodeName);
+        outsideAccommodationApproval.setApproverId(SecurityUtils.getLoginUser().getUser().getUserId());
+        // SecurityUtils.getUserName()是工号
+        outsideAccommodationApproval.setApproverName(SecurityUtils.getLoginUser().getUser().getNickName());
+//        System.out.println(SecurityUtils.getLoginUser().getUser());
+        // 若变量未传递，直接用默认值“同意”（前端点击同意按钮的默认意见）
+        outsideAccommodationApproval.setApprovalOpinion(approvalOpinion);
+
+        // 审核状态
+        outsideAccommodationApproval.setApprovalResult(approvalResult == null ? 0L : approvalResult);
+
+        // 审批时间：当前系统时间
+        outsideAccommodationApproval.setApprovalTime(new Date());
+        outsideAccommodationApproval.setStudentName(studentName);
+        outsideAccommodationApproval.setStudentNo(studentNo);
+        OutsideAccommodationApprovalMapper outsideAccommodationApprovalMapper = (OutsideAccommodationApprovalMapper) SpringUtils.getBean(OutsideAccommodationApprovalMapper.class);
+        // 查询审批记录是否存在
+        OutsideAccommodationApproval approval = outsideAccommodationApprovalMapper.selectOutsideAccommodationApprovalByStuName(studentName, studentNo, SecurityUtils.getLoginUser().getUser().getUserId());
+        if (approval == null) {
+            outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval);
+        } else {
+            approval.setId(approval.getId());
+            outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval);
+        }
+    }
+}
\ No newline at end of file
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java
new file mode 100644
index 0000000..557c172
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java
@@ -0,0 +1,171 @@
+package com.srs.flowable.listener.outsideAccommodation;
+
+import com.srs.common.core.domain.entity.SysUser;
+import com.srs.common.doman.vo.TeacherVo;
+import com.srs.common.utils.spring.SpringUtils;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.srs.flowable.domain.EnlistmentReserve;
+import com.srs.flowable.domain.OutsideAccommodationApply;
+import com.srs.flowable.mapper.EnlistmentReserveMapper;
+import com.srs.flowable.mapper.OutsideAccommodationApplyMapper;
+import com.srs.system.service.ISysUserService;
+import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.bpmn.model.FlowNode;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * 审批流程负责人自动流转监听器
+ * 用于节点审批之前时，更新下一个节点的负责人变量(approval)
+ */
+@Component("OutsideAccommodationStartListener") // Spring Bean名称，与BPMN表达式对应
+public class OutsideAccommodationStartListener implements ExecutionListener {
+
+    @Autowired
+    private ISysUserService sysUserService; // 用户服务（查询部门/学院负责人）
+
+    // 用于查询流程定义中的节点信息
+    @Autowired
+    private RepositoryService repositoryService;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        // 1. 获取当前节点ID和流程定义ID
+        String currentActivityId = execution.getCurrentActivityId(); // 当前节点ID（兼容所有版本）
+        String processDefinitionId = execution.getProcessDefinitionId(); // 流程定义ID
+
+        // 2. 根据节点ID查询节点名称（核心修正：通过流程定义获取名称）
+        String currentNodeName = getNodeNameByActivityId(processDefinitionId, currentActivityId);
+        if (currentNodeName == null) {
+            throw new RuntimeException("未找到节点ID=" + currentActivityId + "的名称");
+        }
+
+        // 获取申请表id
+        Long accommodationId = Long.valueOf(execution.getVariable("accommodationId").toString());
+
+
+        // 后续逻辑不变：查询下一个节点负责人并更新变量
+        Long nextAssigneeId = getNextAssignee(currentNodeName, accommodationId);
+        if (nextAssigneeId != null) {
+            execution.setVariable("approval", nextAssigneeId);
+            execution.setVariable("currentNode", currentNodeName);
+        }
+    }
+
+    /**
+     * 根据节点ID和流程定义ID，查询节点名称（兼容所有版本的核心方法）
+     */
+    private String getNodeNameByActivityId(String processDefinitionId, String activityId) {
+        // 获取流程模型
+        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+        if (bpmnModel == null) {
+            throw new RuntimeException("未找到流程定义ID=" + processDefinitionId + "的模型");
+        }
+
+        // 从模型中获取节点信息（FlowNode包含用户任务、网关等节点）
+        FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(activityId);
+        return flowNode != null ? flowNode.getName() : null;
+    }
+
+    /**
+     * 根据当前节点查询下一个节点的负责人
+     */
+    private Long getNextAssignee(String currentNodeName, Long accommodationId) {
+        OutsideAccommodationApplyMapper outsideAccommodationApplyMapper = SpringUtils.getBean(OutsideAccommodationApplyMapper.class);
+        // 根据Id查询外宿申请记录
+        OutsideAccommodationApply outsideAccommodationApply = outsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyById(accommodationId);
+        // 根据学生学号来获取对应辅导员的信息
+        TeacherVo counselorInfo = outsideAccommodationApplyMapper.getCounselorInfo(outsideAccommodationApply.getStudentNo());
+        // 获取辅导员的部门id
+        Long currentDeptId = counselorInfo.getDeptId();
+        if (currentDeptId == null) {
+            throw new RuntimeException("未分配部门，无法匹配负责人");
+        }
+        // 注意：节点名称需与BPMN模型中完全一致（区分大小写）
+        switch (currentNodeName) {
+            case "辅导员审批":
+                // 辅导员开始审批前 → 找到对应辅导员
+                // 返回匹配的辅导员用户ID（作为当前节点负责人）
+                return counselorInfo.getUserId();
+
+            case "二级学院书记审批":
+
+                // 二级学院书记开始审批前 → 找到对应二级学院书记
+                // 查询角色ID=106（二级学院书记）的所有用户
+                SysUser queryUser = new SysUser();
+                queryUser.setRoleId(106L); // 二级学院书记角色固定ID
+                List<SysUser> academicAffairsUsers = sysUserService.selectAllocatedList(queryUser);
+                if (academicAffairsUsers.isEmpty()) {
+                    throw new RuntimeException("未查询到角色（二级学院书记）的用户");
+                }
+
+                // 从学务用户中筛选出部门ID与当前二级学院书记部门一致的用户
+                SysUser targetAcademic = academicAffairsUsers.stream()
+                        .filter(user -> currentDeptId.equals(user.getDeptId())) // 部门ID匹配
+                        .findFirst() // 取第一个匹配的二级学院书记（若有多个，可根据排序或优先级调整）
+                        .orElseThrow(() -> new RuntimeException("未找到部门ID=" + currentDeptId + "的二级学院书记负责人"));
+
+
+                // 返回匹配的二级学院书记用户ID（作为当前节点负责人）
+                return targetAcademic.getUserId();
+
+            case "学工处审批":
+
+                // 学工处审批前 → 找到对应学工处
+                // 查询角色ID=100（学工处）的所有用户
+                SysUser qUser = new SysUser();
+                qUser.setRoleId(100L); // 学工处角色固定ID=100
+                List<SysUser> collegeUsers = sysUserService.selectAllocatedList(qUser);
+                if (collegeUsers.isEmpty()) {
+                    throw new RuntimeException("未查询到角色（学工处）的用户");
+                }
+
+                // 筛选出部门ID（学院ID）与登录用户所属学院一致的学工处负责人
+                SysUser targetCollegeLeader = collegeUsers.stream()
+                        .filter(user -> currentDeptId.equals(user.getDeptId())) // 学院ID匹配（部门ID即学院ID）
+                        .findFirst()
+                        // 找不到匹配的则取列表第二个用户
+                        .orElse(collegeUsers.get(2));
+                        //.orElseThrow(() -> new RuntimeException("未找到学院ID=" + currentDeptId + "的学工处负责人"));
+
+
+                // 返回匹配的学工处负责人ID
+                return targetCollegeLeader.getUserId();
+
+            case "学校领导审批":
+                // 学校领导审批前 → 找到对应学校领导
+                // 查询角色ID=107（学校领导）的所有用户
+                SysUser sysUser = new SysUser();
+                sysUser.setRoleId(107L); // 学校领导角色固定ID=107
+                List<SysUser> sysUsers = sysUserService.selectAllocatedList(sysUser);
+                if (sysUsers.isEmpty()) {
+                    throw new RuntimeException("未查询到角色（学校领导）的用户");
+                }
+
+                // 筛选出部门ID（学院ID）与登录用户所属学院一致的学校领导负责人
+                // 改造：findFirst() 找不到则取列表第一个，而非直接抛异常
+                SysUser userByDeptId = sysUsers.stream()
+                        .filter(user -> currentDeptId.equals(user.getDeptId())) // 学院ID匹配（部门ID即学院ID）
+                        .findFirst()
+                        // 找不到匹配的则取列表第一个用户
+                        .orElse(sysUsers.get(0));
+
+                // 兜底校验（防止极端情况，理论上sysUsers非空，sysUsers.get(0)不会为null）
+                if (userByDeptId == null) {
+                    throw new RuntimeException("学校领导用户数据异常，无可用负责人");
+                }
+
+                // 返回匹配的学校领导负责人ID（优先匹配学院，无匹配则取第一个）
+                return userByDeptId.getUserId();
+
+            default:
+                throw new RuntimeException("未配置节点[" + currentNodeName + "]的当前负责人规则");
+        }
+    }
+}
\ No newline at end of file
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuCounselorListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuCounselorListener.java
index a80fd84..f6a0fb5 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuCounselorListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuCounselorListener.java
@@ -50,7 +50,7 @@ public class StuCounselorListener implements ExecutionListener {
 
                     // 构造包含超链接的消息内容
                     String content = "您有一条新的学生违纪审批任务待处理，" +
-                            "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>点此查看</a>";
+                            "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>点此查看</a>";
 
                     // 发送企业微信消息
                     weChatUtil.sendTextMessage(userName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuReceiveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuReceiveListener.java
index d9d4e61..7cb6f56 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuReceiveListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/relieve/StuReceiveListener.java
@@ -37,7 +37,7 @@ public class StuReceiveListener implements ExecutionListener {
 
                 String content = "您的违纪处理流程有新的进展：" +
                         approveResult + "，" +
-                        "<a href='http://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>点此查看详情</a>";
+                        "<a href='https://zhxg.gxsdxy.cn/wab/#/pages/Approval/index'>点此查看详情</a>";
 
                 // 发送企业微信消息
                 weChatUtil.sendTextMessage(stuUserName, content);
diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java
new file mode 100644
index 0000000..b34697e
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApplyMapper.java
@@ -0,0 +1,85 @@
+package com.srs.flowable.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.srs.common.doman.vo.TeacherVo;
+import com.srs.flowable.domain.OutsideAccommodationApply;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 外宿申请Mapper接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface OutsideAccommodationApplyMapper extends BaseMapper<OutsideAccommodationApply> {
+    /**
+     * 查询外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 外宿申请
+     */
+    public OutsideAccommodationApply selectDmsOutsideAccommodationApplyById(Long id);
+
+    /**
+     * 查询外宿申请列表
+     *
+     * @param outsideAccommodationApply 外宿申请
+     * @return 外宿申请集合
+     */
+    List<OutsideAccommodationApply> selectDmsOutsideAccommodationApplyList(OutsideAccommodationApply outsideAccommodationApply);
+
+    //    <!--  根据学号查询辅导员信息  -->
+    public TeacherVo getCounselorInfo(String stuNo);
+
+    /**
+     * 获取审批用户信息
+     * @param roleName
+     * @return
+     * 邵政文
+     */
+    List<TeacherVo> getShenDataInfo(String roleName);
+
+    /**
+     * 查询外宿申请
+     *
+     * @param studentName 学生姓名
+     * @return 应征入伍保留学籍申请
+     */
+    public OutsideAccommodationApply getAccommodationByStuNameAndStuNo(@Param("studentName") String studentName, @Param("studentNo") String studentNo);
+
+    /**
+     * 新增外宿申请
+     *
+     * @param outsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+    int insertDmsOutsideAccommodationApply(OutsideAccommodationApply outsideAccommodationApply);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApply(OutsideAccommodationApply outsideAccommodationApply);
+
+    /**
+     * 删除外宿申请
+     *
+     * @param id 外宿申请主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyById(Long id);
+
+    /**
+     * 批量删除外宿申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApplyByIds(Long[] ids);
+}
diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApprovalMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApprovalMapper.java
new file mode 100644
index 0000000..8ca8428
--- /dev/null
+++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/OutsideAccommodationApprovalMapper.java
@@ -0,0 +1,71 @@
+package com.srs.flowable.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.srs.flowable.domain.OutsideAccommodationApproval;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 外宿申请审批记录Mapper接口
+ *
+ * @author srs
+ * @date 2025-12-05
+ */
+public interface OutsideAccommodationApprovalMapper extends BaseMapper<OutsideAccommodationApproval> {
+    /**
+     * 查询外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 外宿申请审批记录
+     */
+    public OutsideAccommodationApproval selectDmsOutsideAccommodationApprovalById(Long id);
+
+    /**
+     * 根据学生姓名学号和审批人id查询保留学籍审批记录
+     *
+     * @param
+     * @return 结果
+     */
+    OutsideAccommodationApproval selectOutsideAccommodationApprovalByStuName(@Param("studentName") String studentName, @Param("studentNo") String studentNo, @Param("approverId") Long approverId);
+
+    /**
+     * 查询外宿申请审批记录列表
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 外宿申请审批记录集合
+     */
+    List<OutsideAccommodationApproval> selectDmsOutsideAccommodationApprovalList(OutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 新增外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int insertDmsOutsideAccommodationApproval(OutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 修改外宿申请审批记录
+     *
+     * @param dmsOutsideAccommodationApproval 外宿申请审批记录
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApproval(OutsideAccommodationApproval dmsOutsideAccommodationApproval);
+
+    /**
+     * 删除外宿申请审批记录
+     *
+     * @param id 外宿申请审批记录主键
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalById(Long id);
+
+    /**
+     * 批量删除外宿申请审批记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDmsOutsideAccommodationApprovalByIds(Long[] ids);
+}
diff --git a/srs-flowable/src/main/java/com/srs/flowable/service/impl/FlowTaskServiceImpl.java b/srs-flowable/src/main/java/com/srs/flowable/service/impl/FlowTaskServiceImpl.java
index 2866b62..745370e 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/service/impl/FlowTaskServiceImpl.java
@@ -218,6 +218,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             // 如果父级任务多于 1 个，说明当前节点不是并行节点，原因为不考虑多对多情况
             if (targetIds.size() > 1) {
                 // 1 对 多任务跳转，currentIds 当前节点(1)，targetIds 跳转到的节点(多)
+                if (CollectionUtils.isEmpty(currentIds)) {
+                    throw new CustomException("未找到可驳回的当前任务节点");
+                }
                 runtimeService.createChangeActivityStateBuilder()
                         .processInstanceId(task.getProcessInstanceId()).
                         moveSingleActivityIdToActivityIds(currentIds.get(0), targetIds).changeState();
@@ -520,10 +523,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .startedBy(userId.toString())
                 .orderByProcessInstanceStartTime()
                 .desc();
-        List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
-        page.setTotal(historicProcessInstanceQuery.count());
+        List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.list();
         List<FlowTaskDto> flowList = new ArrayList<>();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         for (HistoricProcessInstance hisIns : historicProcessInstances) {
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(queryVo.getDeployTime())) {
+                String startDate = dateFormat.format(hisIns.getStartTime());
+                if (!startDate.equals(queryVo.getDeployTime())) {
+                    continue;
+                }
+            }
             FlowTaskDto flowTask = new FlowTaskDto();
             flowTask.setCreateTime(hisIns.getStartTime());
             flowTask.setFinishTime(hisIns.getEndTime());
@@ -576,7 +585,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
             flowList.add(flowTask);
         }
-        page.setRecords(flowList);
+        int total = flowList.size();
+        page.setTotal(total);
+        int fromIndex = Math.max(0, (queryVo.getPageNum() - 1) * queryVo.getPageSize());
+        int toIndex = Math.min(total, fromIndex + queryVo.getPageSize());
+        page.setRecords(fromIndex < toIndex ? flowList.subList(fromIndex, toIndex) : new ArrayList<>());
         return AjaxResult.success(page);
     }
 
@@ -700,9 +713,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //        if (StringUtils.isNotBlank(queryVo.getName())){
 //            taskQuery.processDefinitionNameLike(queryVo.getName());
 //        }
-        page.setTotal(taskQuery.count());
-        List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
+        List<Task> taskList = taskQuery.list();
         List<FlowTaskDto> flowList = new ArrayList<>();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         for (Task task : taskList) {
             FlowTaskDto flowTask = new FlowTaskDto();
             // 当前流程信息
@@ -730,10 +743,24 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserId(startUser.getUserId().toString());
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(queryVo.getStartUserName())) {
+                if (flowTask.getStartUserName() == null || !flowTask.getStartUserName().contains(queryVo.getStartUserName())) {
+                    continue;
+                }
+            }
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(queryVo.getDeployTime())) {
+                String startDate = dateFormat.format(historicProcessInstance.getStartTime());
+                if (!startDate.equals(queryVo.getDeployTime())) {
+                    continue;
+                }
+            }
             flowList.add(flowTask);
         }
-
-        page.setRecords(flowList);
+        int total = flowList.size();
+        page.setTotal(total);
+        int fromIndex = Math.max(0, (queryVo.getPageNum() - 1) * queryVo.getPageSize());
+        int toIndex = Math.min(total, fromIndex + queryVo.getPageSize());
+        page.setRecords(fromIndex < toIndex ? flowList.subList(fromIndex, toIndex) : new ArrayList<>());
         return AjaxResult.success(page);
     }
 
@@ -774,7 +801,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskInstanceQuery.taskCompletedBefore(endTime);
         }
 
-        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
+        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.list();
         List<FlowTaskDto> hisTaskList = new ArrayList<>();
         for (HistoricTaskInstance histTask : historicTaskInstanceList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -809,10 +836,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserId(startUser.getNickName());
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(startUser.getDept()!=null?startUser.getDept().getDeptName():"");
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(queryVo.getStartUserName())) {
+                if (flowTask.getStartUserName() == null || !flowTask.getStartUserName().contains(queryVo.getStartUserName())) {
+                    continue;
+                }
+            }
             hisTaskList.add(flowTask);
         }
-        page.setTotal(taskInstanceQuery.count());
-        page.setRecords(hisTaskList);
+        int totalFinished = hisTaskList.size();
+        page.setTotal(totalFinished);
+        int fromIndexFinished = Math.max(0, (queryVo.getPageNum() - 1) * queryVo.getPageSize());
+        int toIndexFinished = Math.min(totalFinished, fromIndexFinished + queryVo.getPageSize());
+        page.setRecords(fromIndexFinished < toIndexFinished ? hisTaskList.subList(fromIndexFinished, toIndexFinished) : new ArrayList<>());
         return AjaxResult.success(page);
     }
 
diff --git a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml
new file mode 100644
index 0000000..0bac24a
--- /dev/null
+++ b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApplyMapper.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.flowable.mapper.OutsideAccommodationApplyMapper">
+
+    <resultMap type="OutsideAccommodationApply" id="DmsOutsideAccommodationApplyResult">
+        <result property="id" column="id"/>
+        <result property="applyNo" column="apply_no"/>
+        <result property="studentId" column="student_id"/>
+        <result property="studentNo" column="student_no"/>
+        <result property="studentName" column="student_name"/>
+        <result property="gender" column="gender"/>
+        <result property="birthDate" column="birth_date"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="majorId" column="major_id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="classId" column="class_id"/>
+        <result property="className" column="class_name"/>
+        <result property="originalDormitory" column="original_dormitory"/>
+        <result property="accommodationFee" column="accommodation_fee"/>
+        <result property="accommodationFeeStatus" column="accommodation_fee_status"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="outsideAddress" column="outside_address"/>
+        <result property="address" column="address"/>
+        <result property="emergencyPhone" column="emergency_phone"/>
+        <result property="emergencyContact" column="emergency_contact"/>
+        <result property="parentOpinion" column="parent_opinion"/>
+        <result property="parentSignAttachment" column="parent_sign_attachment"/>
+        <result property="parentPhone" column="parent_phone"/>
+        <result property="parentAddress" column="parent_address"/>
+        <result property="parentDetailAddress" column="parent_detail_address"/>
+        <result property="studentPromiseSign" column="student_promise_sign"/>
+        <result property="promiseDate" column="promise_date"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="status" column="status"/>
+        <result property="rejectReason" column="reject_reason"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="isValid" column="is_valid"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="affixId" column="affix_id"/>
+        <result property="deployId" column="deploy_id"/>
+        <result property="processInstanceId" column="process_instance_id"/>
+        <result property="idCard" column="idCard"/>
+        <result property="studentPhone" column="studentPhone"/>
+        <result property="studentSignature" column="student_signature"/>
+    </resultMap>
+
+    <sql id="selectDmsOutsideAccommodationApplyVo">
+        select id,
+               apply_no,
+               student_id,
+               student_no,
+               student_name,
+               gender,
+               birth_date,
+               dept_id,
+               dept_name,
+               major_id,
+               major_name,
+               class_id,
+               class_name,
+               original_dormitory,
+               accommodation_fee,
+               accommodation_fee_status,
+               apply_reason,
+               outside_address,
+               address,
+               emergency_phone,
+               emergency_contact,
+               parent_opinion,
+               parent_sign_attachment,
+               parent_phone,
+               parent_address,
+               parent_detail_address,
+               student_promise_sign,
+               promise_date,
+               start_date,
+               end_date,
+               status,
+               reject_reason,
+               create_time,
+               create_by,
+               update_time,
+               update_by,
+               is_valid,
+               teacher_name,
+               affix_id,
+               deploy_id,
+               process_instance_id,
+               idCard,
+               studentPhone,
+               student_signature
+        from dms_outside_accommodation_apply
+    </sql>
+
+    <select id="selectDmsOutsideAccommodationApplyList" parameterType="DmsOutsideAccommodationApply"
+            resultMap="DmsOutsideAccommodationApplyResult">
+        <include refid="selectDmsOutsideAccommodationApplyVo"/>
+        <where>
+            <if test="applyNo != null  and applyNo != ''">and apply_no = #{applyNo}</if>
+            <if test="studentId != null ">and student_id = #{studentId}</if>
+            <if test="studentNo != null  and studentNo != ''">and student_no = #{studentNo}</if>
+            <if test="studentName != null  and studentName != ''">and student_name like concat('%', #{studentName},
+                '%')
+            </if>
+            <if test="gender != null  and gender != ''">and gender = #{gender}</if>
+            <if test="birthDate != null ">and birth_date = #{birthDate}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="majorId != null ">and major_id = #{majorId}</if>
+            <if test="majorName != null  and majorName != ''">and major_name like concat('%', #{majorName}, '%')</if>
+            <if test="classId != null ">and class_id = #{classId}</if>
+            <if test="className != null  and className != ''">and class_name like concat('%', #{className}, '%')</if>
+            <if test="originalDormitory != null  and originalDormitory != ''">and original_dormitory =
+                #{originalDormitory}
+            </if>
+            <if test="accommodationFee != null  and accommodationFee != ''">and accommodation_fee =
+                #{accommodationFee}
+            </if>
+            <if test="accommodationFeeStatus != null ">and accommodation_fee_status = #{accommodationFeeStatus}</if>
+            <if test="applyReason != null  and applyReason != ''">and apply_reason = #{applyReason}</if>
+            <if test="outsideAddress != null  and outsideAddress != ''">and outside_address = #{outsideAddress}</if>
+            <if test="address != null  and address != ''">and address = #{address}</if>
+            <if test="emergencyPhone != null  and emergencyPhone != ''">and emergency_phone = #{emergencyPhone}</if>
+            <if test="emergencyContact != null  and emergencyContact != ''">and emergency_contact =
+                #{emergencyContact}
+            </if>
+            <if test="parentOpinion != null ">and parent_opinion = #{parentOpinion}</if>
+            <if test="parentSignAttachment != null  and parentSignAttachment != ''">and parent_sign_attachment =
+                #{parentSignAttachment}
+            </if>
+            <if test="parentPhone != null  and parentPhone != ''">and parent_phone = #{parentPhone}</if>
+            <if test="parentAddress != null  and parentAddress != ''">and parent_address = #{parentAddress}</if>
+            <if test="parentDetailAddress != null  and parentDetailAddress != ''">and parent_detail_address =
+                #{parentDetailAddress}
+            </if>
+            <if test="studentPromiseSign != null  and studentPromiseSign != ''">and student_promise_sign =
+                #{studentPromiseSign}
+            </if>
+            <if test="promiseDate != null ">and promise_date = #{promiseDate}</if>
+            <if test="startDate != null ">and start_date = #{startDate}</if>
+            <if test="endDate != null ">and end_date = #{endDate}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="rejectReason != null  and rejectReason != ''">and reject_reason = #{rejectReason}</if>
+            <if test="isValid != null ">and is_valid = #{isValid}</if>
+            <if test="teacherName != null  and teacherName != ''">and teacher_name like concat('%', #{teacherName},
+                '%')
+            </if>
+            <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
+            <if test="deployId != null  and deployId != ''">and deploy_id = #{deployId}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''">and process_instance_id =
+                #{processInstanceId}
+            </if>
+            <if test="idCard != null  and idCard != ''">and idCard = #{idCard}</if>
+            <if test="studentPhone != null  and studentPhone != ''">and studentPhone = #{studentPhone}</if>
+            <if test="studentSignature != null  and studentSignature != ''">and student_signature =
+                #{studentSignature}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDmsOutsideAccommodationApplyById" parameterType="Long"
+            resultMap="DmsOutsideAccommodationApplyResult">
+        <include refid="selectDmsOutsideAccommodationApplyVo"/>
+        where id = #{id}
+    </select>
+
+
+    <!--根据学生姓名和学号查询申请表-->
+    <select id="getAccommodationByStuNameAndStuNo" resultMap="DmsOutsideAccommodationApplyResult">
+        select *
+        from rt_enlistment_reserve
+        <where>
+            <if test="studentName != null and studentName != ''">
+                and student_name = #{studentName}
+            </if>
+            <if test="studentNo != null and studentNo != ''">
+                and student_no = #{studentNo}
+            </if>
+        </where>
+    </select>
+
+
+    <!--  根据学号查询辅导员信息  -->
+    <select id="getCounselorInfo" resultType="com.srs.common.doman.vo.TeacherVo">
+        SELECT d.user_id userId, d.dept_id deptId, d.user_name userName, d.nick_name nickName
+        FROM srs_student a
+                 LEFT JOIN srs_class b ON a.class_id = b.class_id
+                 LEFT JOIN cph_teacher c ON b.teacher_id = c.teacher_id
+                 LEFT JOIN sys_user d ON c.employee_id = d.user_name
+        WHERE a.stu_no = #{stuNo}
+    </select>
+
+    <!-- 获取审批用户信息 -->
+    <select id="getShenDataInfo" resultType="com.srs.common.doman.vo.TeacherVo">
+        SELECT a.user_id userId, a.dept_id deptId, a.nick_name userNick, a.user_name userName
+        FROM sys_user a
+                 LEFT JOIN sys_user_role b ON a.user_id = b.user_id
+                 LEFT JOIN sys_role c ON b.role_id = c.role_id
+        WHERE c.role_name = #{roleName}
+    </select>
+
+    <insert id="insertDmsOutsideAccommodationApply" parameterType="OutsideAccommodationApply" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into dms_outside_accommodation_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no,</if>
+            <if test="studentId != null">student_id,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="gender != null">gender,</if>
+            <if test="birthDate != null">birth_date,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="majorId != null">major_id,</if>
+            <if test="majorName != null and majorName != ''">major_name,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="className != null and className != ''">class_name,</if>
+            <if test="originalDormitory != null and originalDormitory != ''">original_dormitory,</if>
+            <if test="accommodationFee != null and accommodationFee != ''">accommodation_fee,</if>
+            <if test="accommodationFeeStatus != null">accommodation_fee_status,</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason,</if>
+            <if test="outsideAddress != null and outsideAddress != ''">outside_address,</if>
+            <if test="address != null and address != ''">address,</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">emergency_phone,</if>
+            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact,</if>
+            <if test="parentOpinion != null">parent_opinion,</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">parent_sign_attachment,</if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone,</if>
+            <if test="parentAddress != null and parentAddress != ''">parent_address,</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">parent_detail_address,</if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">student_promise_sign,</if>
+            <if test="promiseDate != null">promise_date,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="status != null">status,</if>
+            <if test="rejectReason != null">reject_reason,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="isValid != null">is_valid,</if>
+            <if test="teacherName != null and teacherName != ''">teacher_name,</if>
+            <if test="affixId != null">affix_id,</if>
+            <if test="deployId != null">deploy_id,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="idCard != null and idCard != ''">idCard,</if>
+            <if test="studentPhone != null">studentPhone,</if>
+            <if test="studentSignature != null">student_signature,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
+            <if test="studentId != null">#{studentId},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="birthDate != null">#{birthDate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="majorId != null">#{majorId},</if>
+            <if test="majorName != null and majorName != ''">#{majorName},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="className != null and className != ''">#{className},</if>
+            <if test="originalDormitory != null and originalDormitory != ''">#{originalDormitory},</if>
+            <if test="accommodationFee != null and accommodationFee != ''">#{accommodationFee},</if>
+            <if test="accommodationFeeStatus != null">#{accommodationFeeStatus},</if>
+            <if test="applyReason != null and applyReason != ''">#{applyReason},</if>
+            <if test="outsideAddress != null and outsideAddress != ''">#{outsideAddress},</if>
+            <if test="address != null and address != ''">#{address},</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">#{emergencyPhone},</if>
+            <if test="emergencyContact != null and emergencyContact != ''">#{emergencyContact},</if>
+            <if test="parentOpinion != null">#{parentOpinion},</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">#{parentSignAttachment},</if>
+            <if test="parentPhone != null and parentPhone != ''">#{parentPhone},</if>
+            <if test="parentAddress != null and parentAddress != ''">#{parentAddress},</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">#{parentDetailAddress},</if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">#{studentPromiseSign},</if>
+            <if test="promiseDate != null">#{promiseDate},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="rejectReason != null">#{rejectReason},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="isValid != null">#{isValid},</if>
+            <if test="teacherName != null and teacherName != ''">#{teacherName},</if>
+            <if test="affixId != null">#{affixId},</if>
+            <if test="deployId != null">#{deployId},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="idCard != null and idCard != ''">#{idCard},</if>
+            <if test="studentPhone != null">#{studentPhone},</if>
+            <if test="studentSignature != null">#{studentSignature},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDmsOutsideAccommodationApply" parameterType="OutsideAccommodationApply">
+        update dms_outside_accommodation_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="birthDate != null">birth_date = #{birthDate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="majorId != null">major_id = #{majorId},</if>
+            <if test="majorName != null and majorName != ''">major_name = #{majorName},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="originalDormitory != null and originalDormitory != ''">original_dormitory =
+                #{originalDormitory},
+            </if>
+            <if test="accommodationFee != null and accommodationFee != ''">accommodation_fee = #{accommodationFee},</if>
+            <if test="accommodationFeeStatus != null">accommodation_fee_status = #{accommodationFeeStatus},</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason = #{applyReason},</if>
+            <if test="outsideAddress != null and outsideAddress != ''">outside_address = #{outsideAddress},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="emergencyPhone != null and emergencyPhone != ''">emergency_phone = #{emergencyPhone},</if>
+            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact = #{emergencyContact},</if>
+            <if test="parentOpinion != null">parent_opinion = #{parentOpinion},</if>
+            <if test="parentSignAttachment != null and parentSignAttachment != ''">parent_sign_attachment =
+                #{parentSignAttachment},
+            </if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone = #{parentPhone},</if>
+            <if test="parentAddress != null and parentAddress != ''">parent_address = #{parentAddress},</if>
+            <if test="parentDetailAddress != null and parentDetailAddress != ''">parent_detail_address =
+                #{parentDetailAddress},
+            </if>
+            <if test="studentPromiseSign != null and studentPromiseSign != ''">student_promise_sign =
+                #{studentPromiseSign},
+            </if>
+            <if test="promiseDate != null">promise_date = #{promiseDate},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="rejectReason != null">reject_reason = #{rejectReason},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="isValid != null">is_valid = #{isValid},</if>
+            <if test="teacherName != null and teacherName != ''">teacher_name = #{teacherName},</if>
+            <if test="affixId != null">affix_id = #{affixId},</if>
+            <if test="deployId != null">deploy_id = #{deployId},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="idCard != null and idCard != ''">idCard = #{idCard},</if>
+            <if test="studentPhone != null">studentPhone = #{studentPhone},</if>
+            <if test="studentSignature != null">student_signature = #{studentSignature},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsOutsideAccommodationApplyById" parameterType="Long">
+        delete
+        from dms_outside_accommodation_apply
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsOutsideAccommodationApplyByIds" parameterType="String">
+        delete from dms_outside_accommodation_apply where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml
new file mode 100644
index 0000000..cc4d0d9
--- /dev/null
+++ b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.flowable.mapper.OutsideAccommodationApprovalMapper">
+    
+    <resultMap type="DmsOutsideAccommodationApproval" id="DmsOutsideAccommodationApprovalResult">
+        <result property="id"    column="id"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="applyNo"    column="apply_no"    />
+        <result property="approvalNode"    column="approval_node"    />
+        <result property="approverId"    column="approver_id"    />
+        <result property="approverName"    column="approver_name"    />
+        <result property="approverRole"    column="approver_role"    />
+        <result property="approvalOpinion"    column="approval_opinion"    />
+        <result property="approvalResult"    column="approval_result"    />
+        <result property="approvalTime"    column="approval_time"    />
+        <result property="processInstanceId"    column="process_instance_id"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="studentNo"    column="student_no"    />
+    </resultMap>
+
+    <sql id="selectDmsOutsideAccommodationApprovalVo">
+        select id, apply_id, apply_no, approval_node, approver_id, approver_name, approver_role, approval_opinion, approval_result, approval_time, process_instance_id, student_name, student_no from dms_outside_accommodation_approval
+    </sql>
+
+    <select id="selectDmsOutsideAccommodationApprovalList" parameterType="DmsOutsideAccommodationApproval" resultMap="DmsOutsideAccommodationApprovalResult">
+        <include refid="selectDmsOutsideAccommodationApprovalVo"/>
+        <where>  
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="applyNo != null  and applyNo != ''"> and apply_no = #{applyNo}</if>
+            <if test="approvalNode != null "> and approval_node = #{approvalNode}</if>
+            <if test="approverId != null "> and approver_id = #{approverId}</if>
+            <if test="approverName != null  and approverName != ''"> and approver_name like concat('%', #{approverName}, '%')</if>
+            <if test="approverRole != null  and approverRole != ''"> and approver_role = #{approverRole}</if>
+            <if test="approvalOpinion != null  and approvalOpinion != ''"> and approval_opinion = #{approvalOpinion}</if>
+            <if test="approvalResult != null "> and approval_result = #{approvalResult}</if>
+            <if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="studentNo != null  and studentNo != ''"> and student_no = #{studentNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectDmsOutsideAccommodationApprovalById" parameterType="Long" resultMap="DmsOutsideAccommodationApprovalResult">
+        <include refid="selectDmsOutsideAccommodationApprovalVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectOutsideAccommodationApprovalByStuName" resultMap="DmsOutsideAccommodationApprovalResult">
+        select *
+        from dms_outside_accommodation_approval
+        <where>
+            <if test="studentName != null and studentName != ''">
+                and student_name = #{studentName}
+            </if>
+            <if test="studentNo != null and studentNo != ''">
+                and student_no = #{studentNo}
+            </if>
+            <if test="approverId != null and approverId != ''">
+                and approver_id = #{approverId}
+            </if>
+        </where>
+    </select>
+        
+    <insert id="insertDmsOutsideAccommodationApproval" parameterType="DmsOutsideAccommodationApproval" useGeneratedKeys="true" keyProperty="id">
+        insert into dms_outside_accommodation_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">apply_id,</if>
+            <if test="applyNo != null and applyNo != ''">apply_no,</if>
+            <if test="approvalNode != null">approval_node,</if>
+            <if test="approverId != null">approver_id,</if>
+            <if test="approverName != null and approverName != ''">approver_name,</if>
+            <if test="approverRole != null and approverRole != ''">approver_role,</if>
+            <if test="approvalOpinion != null">approval_opinion,</if>
+            <if test="approvalResult != null">approval_result,</if>
+            <if test="approvalTime != null">approval_time,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">#{applyId},</if>
+            <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
+            <if test="approvalNode != null">#{approvalNode},</if>
+            <if test="approverId != null">#{approverId},</if>
+            <if test="approverName != null and approverName != ''">#{approverName},</if>
+            <if test="approverRole != null and approverRole != ''">#{approverRole},</if>
+            <if test="approvalOpinion != null">#{approvalOpinion},</if>
+            <if test="approvalResult != null">#{approvalResult},</if>
+            <if test="approvalTime != null">#{approvalTime},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDmsOutsideAccommodationApproval" parameterType="DmsOutsideAccommodationApproval">
+        update dms_outside_accommodation_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
+            <if test="approvalNode != null">approval_node = #{approvalNode},</if>
+            <if test="approverId != null">approver_id = #{approverId},</if>
+            <if test="approverName != null and approverName != ''">approver_name = #{approverName},</if>
+            <if test="approverRole != null and approverRole != ''">approver_role = #{approverRole},</if>
+            <if test="approvalOpinion != null">approval_opinion = #{approvalOpinion},</if>
+            <if test="approvalResult != null">approval_result = #{approvalResult},</if>
+            <if test="approvalTime != null">approval_time = #{approvalTime},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDmsOutsideAccommodationApprovalById" parameterType="Long">
+        delete from dms_outside_accommodation_approval where id = #{id}
+    </delete>
+
+    <delete id="deleteDmsOutsideAccommodationApprovalByIds" parameterType="String">
+        delete from dms_outside_accommodation_approval where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/srs-framework/src/main/java/com/srs/framework/config/SecurityConfig.java b/srs-framework/src/main/java/com/srs/framework/config/SecurityConfig.java
index b70fccc..8cbfd3d 100644
--- a/srs-framework/src/main/java/com/srs/framework/config/SecurityConfig.java
+++ b/srs-framework/src/main/java/com/srs/framework/config/SecurityConfig.java
@@ -20,6 +20,8 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@@ -38,6 +40,7 @@ import com.srs.framework.security.handle.LogoutSuccessHandlerImpl;
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    private static final Logger log = LoggerFactory.getLogger(SecurityConfig.class);
 
     @Autowired
     private CasProperties casProperties;
@@ -232,7 +235,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Bean
     public ServiceProperties serviceProperties() {
         ServiceProperties serviceProperties = new ServiceProperties();
-        serviceProperties.setService(casProperties.getAppServerUrl() + casProperties.getAppLoginUrl());
+        String service = casProperties.getAppServerUrl() + casProperties.getAppLoginUrl();
+        serviceProperties.setService(service);
+        log.info("cas_service=" + service);
         serviceProperties.setAuthenticateAllArtifacts(true);
         return serviceProperties;
     }
diff --git a/srs-framework/src/main/java/com/srs/framework/security/handle/CasAuthenticationSuccessHandler.java b/srs-framework/src/main/java/com/srs/framework/security/handle/CasAuthenticationSuccessHandler.java
index 801f301..c7d23da 100644
--- a/srs-framework/src/main/java/com/srs/framework/security/handle/CasAuthenticationSuccessHandler.java
+++ b/srs-framework/src/main/java/com/srs/framework/security/handle/CasAuthenticationSuccessHandler.java
@@ -27,7 +27,7 @@ import java.io.PrintWriter;
 @Service
 public class CasAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
 
-    protected final Log logger =   LogFactory.getLog(this.getClass());
+    protected final Log logger = LogFactory.getLog(this.getClass());
 
     private RequestCache requestCache = new HttpSessionRequestCache();
 
@@ -71,7 +71,7 @@ public class CasAuthenticationSuccessHandler extends SavedRequestAwareAuthentica
 //        httpSession.setAttribute(Constants.CAS_TOKEN, token);
 //        //登录成功后跳转到前端登录页面
 //        if(com.srs.common.utils.StringUtils.isNotNull(qqtype)){
-//            String webindex="http://zhxg.gxsdxy.cn/hh/#/pages/index/index";
+//            String webindex="https://zhxg.gxsdxy.cn/hh/#/pages/index/index";
 //            getRedirectStrategy().sendRedirect(request, response, casProperties.getWebUrl()+"?jwt="+token);
 //        }else{
 //            getRedirectStrategy().sendRedirect(request, response, casProperties.getWebUrl()+"?jwt="+token);
@@ -105,7 +105,8 @@ public class CasAuthenticationSuccessHandler extends SavedRequestAwareAuthentica
 //        httpSession.setAttribute(Constants.CAS_TOKEN, token);
 //        // 登录成功后跳转到前端登录页面
 //        if (isMobileDevice(request)) {
-////            String webindex = "http://zhxg.gxsdxy.cn/wab/#/pages/index/index";
+
+    /// /            String webindex = "https://zhxg.gxsdxy.cn/wab/#/pages/index/index";
 //            String waburl = casProperties.getWabUrl()+"?jwt="+ token;
 //            getRedirectStrategy().sendRedirect(request, response, waburl);
 //        } else {
@@ -113,51 +114,54 @@ public class CasAuthenticationSuccessHandler extends SavedRequestAwareAuthentica
 //            getRedirectStrategy().sendRedirect(request, response, weburl);
 //        }
 //    }
-
     @Override
-public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-                                    Authentication authentication) throws ServletException, IOException {
-    String targetUrlParameter = getTargetUrlParameter();
-    if (isAlwaysUseDefaultTargetUrl()
-            || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
-        requestCache.removeRequest(request, response);
-        super.onAuthenticationSuccess(request, response, authentication);
-        return;
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
+                                        Authentication authentication) throws ServletException, IOException {
+        String targetUrlParameter = getTargetUrlParameter();
+        if (isAlwaysUseDefaultTargetUrl()
+                || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
+            requestCache.removeRequest(request, response);
+            super.onAuthenticationSuccess(request, response, authentication);
+            return;
+        }
+        clearAuthenticationAttributes(request);
+        LoginUser userDetails = (LoginUser) authentication.getPrincipal();
+        String token = tokenService.createToken(userDetails);
+
+        // 设置后端认证成功标识
+        HttpSession httpSession = request.getSession();
+        httpSession.setAttribute(Constants.CAS_TOKEN, token);
+
+        // 构造跳转 URL
+        String ua = request.getHeader("User-Agent");
+        String referer = request.getHeader("Referer");
+        String requestUrl = request.getRequestURL().toString();
+        String redirectUrl;
+        if (isMobileDevice(request)) {
+            redirectUrl = casProperties.getWabUrl() + "?jwt=" + token;
+        } else {
+            redirectUrl = casProperties.getWebUrl() + "?jwt=" + token;
+        }
+        logger.info("cas_login_success ua=" + ua + " referer=" + referer + " requestUrl=" + requestUrl + " redirectUrl=" + redirectUrl);
+
+        // 使用客户端 JS 跳转替代 sendRedirect
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter writer = response.getWriter();
+        writer.write("<!DOCTYPE html>\n" +
+                "<html>\n" +
+                "<head>\n" +
+                "    <meta charset=\"UTF-8\">\n" +
+                "    <title>Redirecting...</title>\n" +
+                "    <script type=\"text/javascript\">\n" +
+                "        window.location.href = '" + redirectUrl + "';\n" +
+                "    </script>\n" +
+                "</head>\n" +
+                "<body>\n" +
+                "    <p>正在跳转，请稍候...</p>\n" +
+                "</body>\n" +
+                "</html>");
+        writer.flush();
     }
-    clearAuthenticationAttributes(request);
-    LoginUser userDetails = (LoginUser) authentication.getPrincipal();
-    String token = tokenService.createToken(userDetails);
-
-    // 设置后端认证成功标识
-    HttpSession httpSession = request.getSession();
-    httpSession.setAttribute(Constants.CAS_TOKEN, token);
-
-    // 构造跳转 URL
-    String redirectUrl;
-    if (isMobileDevice(request)) {
-        redirectUrl = casProperties.getWabUrl() + "?jwt=" + token;
-    } else {
-        redirectUrl = casProperties.getWebUrl() + "?jwt=" + token;
-    }
-
-    // 使用客户端 JS 跳转替代 sendRedirect
-    response.setContentType("text/html;charset=UTF-8");
-    PrintWriter writer = response.getWriter();
-    writer.write("<!DOCTYPE html>\n" +
-                 "<html>\n" +
-                 "<head>\n" +
-                 "    <meta charset=\"UTF-8\">\n" +
-                 "    <title>Redirecting...</title>\n" +
-                 "    <script type=\"text/javascript\">\n" +
-                 "        window.location.href = '" + redirectUrl + "';\n" +
-                 "    </script>\n" +
-                 "</head>\n" +
-                 "<body>\n" +
-                 "    <p>正在跳转，请稍候...</p>\n" +
-                 "</body>\n" +
-                 "</html>");
-    writer.flush();
-}
 
 
     private boolean isMobileDevice(HttpServletRequest request) {
@@ -165,7 +169,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         if (userAgent == null) {
             return false;
         }
-        return userAgent.matches("(?i).*\\b(mobi|android|iphone|ipad|ipod)\\b.*");
+        return userAgent.matches("(?i).*\\b(mobi|android|iphone|ipad|ipod|wxwork)\\b.*");
     }
 
 }
diff --git a/srs-quartz/pom.xml b/srs-quartz/pom.xml
index 9af7518..1ae4448 100644
--- a/srs-quartz/pom.xml
+++ b/srs-quartz/pom.xml
@@ -29,10 +29,17 @@
             </exclusions>
         </dependency>
 
+        <!-- Spring Context for @Component/@EnableScheduling -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.srs</groupId>
             <artifactId>srs-common</artifactId>
+            <version>3.8.5</version>
         </dependency>
 
         <!--宿舍管理模块-->
@@ -60,13 +67,15 @@
             <groupId>com.srs</groupId>
             <artifactId>srs-routine</artifactId>
             <version>3.8.5</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.srs</groupId>
             <artifactId>srs-staff</artifactId>
+            <version>3.8.5</version>
+
         </dependency>
 
+
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/srs-quartz/src/main/java/com/srs/quartz/config/testForConfig.java b/srs-quartz/src/main/java/com/srs/quartz/config/testForConfig.java
index c6dd9df..109bd36 100644
--- a/srs-quartz/src/main/java/com/srs/quartz/config/testForConfig.java
+++ b/srs-quartz/src/main/java/com/srs/quartz/config/testForConfig.java
@@ -5,19 +5,13 @@ import com.srs.common.utils.DateUtils;
 import com.srs.comprehensive.domain.SrsStuYear;
 import com.srs.comprehensive.mapper.SrsStuYearMapper;
 import com.srs.comprehensive.service.ICphTestForService;
-import com.srs.quartz.domain.SysJob;
 import com.srs.quartz.mapper.SysJobMapper;
-import org.mybatis.logging.Logger;
-import org.mybatis.logging.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/srs-routine/pom.xml b/srs-routine/pom.xml
index e5d6c6e..93b8f3c 100644
--- a/srs-routine/pom.xml
+++ b/srs-routine/pom.xml
@@ -57,24 +57,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.5.3.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-core</artifactId>
-            <version>3.5.3.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.3.1</version>
-            <scope>compile</scope>
-        </dependency>
+
         <!--阿里云核心API-->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -113,4 +96,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java b/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
index e8eebf6..6a91a60 100644
--- a/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
+++ b/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
@@ -369,6 +369,30 @@ private static final long serialVersionUID=1L;
     @Excel(name = "流程部署编号")
     private String deployId;
 
+    /**
+     * 学生编号
+     */
+    @ApiModelProperty("学生编号")
+    @TableField("student_id")
+    @Excel(name = "学生编号")
+    private Long studentId;
+
+    /**
+     * 保留字段1
+     */
+    @ApiModelProperty("保留字段1")
+    @TableField("test_data")
+    @Excel(name = "保留字段1")
+    private String testData;
+
+    /**
+     * 保留字段2
+     */
+    @ApiModelProperty("保留字段2")
+    @TableField("test_test")
+    @Excel(name = "保留字段2")
+    private String testTest;
+
     /**
      * 退伍复学-填报材料
      */
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisBasicDao.java b/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisBasicDao.java
new file mode 100644
index 0000000..e888450
--- /dev/null
+++ b/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisBasicDao.java
@@ -0,0 +1,361 @@
+package com.srs.routine.domain.dto;
+
+
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import com.srs.routine.domain.SysDisMate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+
+/**
+ * 退伍复学申请对象 sys_dis_basic
+ *
+ * @author srs
+ * @date 2025-11-06
+ */
+@Data
+@ApiModel("退伍复学申请")
+public class SysDisBasicDao{
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @Excel(name = "序号",isSeq = true)
+    private Long seq;
+
+//    /**
+//     * 复学流程ID
+//     */
+//    @ApiModelProperty("复学流程ID")
+//    @Excel(name = "复学流程ID")
+//    private String fxId;
+//
+//    /**
+//     * 流程申请时间
+//     */
+//    @ApiModelProperty("流程申请时间")
+//    @Excel(name = "流程申请时间")
+//    private String fxTime;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @Excel(name = "学号")
+    private String stId;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    @Excel(name = "姓名")
+    private String stName;
+
+
+    @ApiModelProperty("学院")
+    @Excel(name = "学院")
+    private String college;
+
+    /**
+     * 辅导员名字
+     */
+//    @ApiModelProperty("辅导员名字")
+//    @Excel(name = "辅导员名字")
+//    private String fdName;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    @Excel(name = "性别")
+    private String sex;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty("民族")
+    @Excel(name = "民族")
+    private String nations;
+
+//    /**
+//     * $column.columnComment
+//     */
+//    @ApiModelProperty("${column.columnComment}")
+//    @Excel(name = "辅导员签名" , readConverterExp = "$column.readConverterExp()")
+//    private String fdQm;
+//
+//    /**
+//     * $column.columnComment
+//     */
+//    @ApiModelProperty("${column.columnComment}")
+//    @Excel(name = "学务签名" , readConverterExp = "$column.readConverterExp()")
+//    private String xwQm;
+//
+//    /**
+//     * $column.columnComment
+//     */
+//    @ApiModelProperty("${column.columnComment}")
+//    @Excel(name = "二级学院签名" , readConverterExp = "$column.readConverterExp()")
+//    private String erQm;
+//
+//    /**
+//     * $column.columnComment
+//     */
+//    @ApiModelProperty("${column.columnComment}")
+//    @Excel(name = "学籍管理签名" , readConverterExp = "$column.readConverterExp()")
+//    private String xjQm;
+//
+//    /**
+//     * $column.columnComment
+//     */
+//    @ApiModelProperty("${column.columnComment}")
+//    @Excel(name = "教务签名" , readConverterExp = "$column.readConverterExp()")
+//    private String jwQm;
+
+    /**
+     * 班级
+     */
+    @ApiModelProperty("班级")
+    @Excel(name = "班级")
+    private String stClass;
+
+    /**
+     * 专业
+     */
+    @ApiModelProperty("专业")
+    @Excel(name = "专业")
+    private String majors;
+
+    /**
+     * 年级
+     */
+    @ApiModelProperty("年级")
+    @Excel(name = "年级")
+    private String grade;
+
+    /**
+     * 学院
+     */
+
+
+    /**
+     * 原因
+     */
+    @ApiModelProperty("原因")
+    @Excel(name = "原因")
+    private String reasons;
+
+//    /**
+//     * 辅导员意见
+//     */
+//    @ApiModelProperty("辅导员意见")
+//    @TableField("fd_idea")
+//    @Excel(name = "辅导员意见")
+//    private String fdIdea;
+//
+//    /**
+//     * 二级学院意见
+//     */
+//    @ApiModelProperty("二级学院意见")
+//    @TableField("two_idea")
+//    @Excel(name = "二级学院意见")
+//    private String twoIdea;
+//
+//    /**
+//     * 学务意见
+//     */
+//    @ApiModelProperty("学务意见")
+//    @TableField("xw_idea")
+//    @Excel(name = "学务意见")
+//    private String xwIdea;
+//
+//    /**
+//     * 学籍管理意见
+//     */
+//    @ApiModelProperty("学籍管理意见")
+//    @TableField("xj_idea")
+//    @Excel(name = "学籍管理意见")
+//    private String xjIdea;
+//
+//    /**
+//     * 教务处意见
+//     */
+//    @ApiModelProperty("教务处意见")
+//    @TableField("jw_idea")
+//    @Excel(name = "教务处意见")
+//    private String jwIdea;
+//
+//    /**
+//     * 招生意见
+//     */
+//    @ApiModelProperty("招生意见")
+//    @TableField("zs_idea")
+//    @Excel(name = "招生意见")
+//    private String zsIdea;
+//
+//    /**
+//     * 招生就业
+//     */
+//    @ApiModelProperty("招生就业")
+//    @TableField("zs_status")
+//    @Excel(name = "招生就业")
+//    private String zsStatus;
+//
+//    /**
+//     * 时间
+//     */
+//    @ApiModelProperty("时间")
+//    @TableField("times")
+//    @Excel(name = "时间")
+//    private String times;
+//
+//    /**
+//     * 辅导员审核状态
+//     */
+//    @ApiModelProperty("辅导员审核状态")
+//    @TableField("fd_status")
+//    @Excel(name = "辅导员审核状态")
+//    private String fdStatus;
+//
+//    /**
+//     *
+//     */
+//    @ApiModelProperty("")
+//    @TableField("xw_status")
+//    @Excel(name = "学务审核状态")
+//    private String xwStatus;
+//
+//    /**
+//     * 二级学院审核状态
+//     */
+//    @ApiModelProperty("二级学院审核状态")
+//    @TableField("two_status")
+//    @Excel(name = "二级学院审核状态")
+//    private String twoStatus;
+//
+//    /**
+//     * 学籍管理审核状态
+//     */
+//    @ApiModelProperty("学籍管理审核状态")
+//    @TableField("xjgl_status")
+//    @Excel(name = "学籍管理审核状态")
+//    private String xjglStatus;
+//
+//    /**
+//     * 教务审核状态
+//     */
+//    @ApiModelProperty("教务审核状态")
+//    @TableField("jw_status")
+//    @Excel(name = "教务审核状态")
+//    private String jwStatus;
+//
+//    /**
+//     * 退伍审核时间
+//     */
+//    @ApiModelProperty("退伍审核时间")
+//    @TableField("rw_time")
+//    @Excel(name = "退伍审核时间")
+//    private String rwTime;
+//
+//    /**
+//     * 招生审核时间
+//     */
+//    @ApiModelProperty("招生审核时间")
+//    @TableField("zs_time")
+//    @Excel(name = "招生审核时间")
+//    private String zsTime;
+//
+//    /**
+//     * 辅导员
+//     */
+//    @ApiModelProperty("辅导员")
+//    @TableField("fd_time")
+//    @Excel(name = "辅导员")
+//    private String fdTime;
+//
+//    /**
+//     * 学务审核
+//     */
+//    @ApiModelProperty("学务审核")
+//    @TableField("xw_time")
+//    @Excel(name = "学务审核")
+//    private String xwTime;
+//
+//    /**
+//     * 二时间
+//     */
+//    @ApiModelProperty("二时间")
+//    @TableField("two_time")
+//    @Excel(name = "二时间")
+//    private String twoTime;
+//
+//    /**
+//     * 学籍时间
+//     */
+//    @ApiModelProperty("学籍时间")
+//    @TableField("xj_time")
+//    @Excel(name = "学籍时间")
+//    private String xjTime;
+//
+//    /**
+//     * 教务审核时间
+//     */
+//    @ApiModelProperty("教务审核时间")
+//    @TableField("jw_time")
+//    @Excel(name = "教务审核时间")
+//    private String jwTime;
+//
+//    /**
+//     * 空余字段
+//     */
+//    @ApiModelProperty("空余字段")
+//    @TableField("datab")
+//    @Excel(name = "空余字段")
+//    private String datab;
+//
+//    /**
+//     *
+//     */
+//    @ApiModelProperty("")
+//    @TableField("dataa")
+//    @Excel(name = "")
+//    private String dataa;
+
+    /**
+     * 专业转换
+     */
+    @ApiModelProperty("专业转换")
+    @Excel(name = "专业转换")
+    private String conversion;
+
+//    /**
+//     * 流程实例ID
+//     */
+//    @ApiModelProperty("流程实例ID")
+//    @TableField("process_id")
+//    @Excel(name = "流程实例ID")
+//    private String processId;
+
+//    /**
+//     * 流程部署编号
+//     */
+//    @ApiModelProperty("流程部署编号")
+//    @TableField("deploy_id")
+//    @Excel(name = "流程部署编号")
+//    private String deployId;
+
+//    /**
+//     * 退伍复学-填报材料
+//     */
+//    @ApiModelProperty(value = "退伍复学-填报材料", hidden = true)
+//    @Excel(name = "退伍复学-填报材料")
+//    private List<SysDisMate> MaList;
+
+}
+
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisMateDao.java b/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisMateDao.java
new file mode 100644
index 0000000..5e95791
--- /dev/null
+++ b/srs-routine/src/main/java/com/srs/routine/domain/dto/SysDisMateDao.java
@@ -0,0 +1,126 @@
+package com.srs.routine.domain.dto;
+
+
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 退伍复学材料对象 sys_dis_mate
+ *
+ * @author srs
+ * @date 2025-11-12
+ */
+@Data
+@ApiModel("退伍复学材料")
+public class SysDisMateDao {
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @Excel(name = "序号",isSeq = true)
+    private Long seq;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @Excel(name = "学号")
+    private String stId;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    @Excel(name = "姓名")
+    private String stName;
+
+    @ApiModelProperty("学院")
+    @Excel(name = "学院")
+    private String college;
+
+    /**
+     * 时间
+     */
+//    @ApiModelProperty("时间")
+//    @Excel(name = "时间")
+//    private String times;
+
+    /**
+     * 学院
+     */
+
+    /**
+     * 原年级
+     */
+    @ApiModelProperty("原年级")
+    @Excel(name = "原年级")
+    private String oldgrade;
+
+    /**
+     * 原专业
+     */
+    @ApiModelProperty("原专业")
+    @Excel(name = "原专业")
+    private String oldmajor;
+
+    /**
+     * 新年级
+     */
+    @ApiModelProperty("新年级")
+    @Excel(name = "新年级")
+    private String newgrade;
+
+    /**
+     * 新专业
+     */
+    @ApiModelProperty("新专业")
+    @Excel(name = "新专业")
+    private String newmajor;
+
+    /**
+     * 退役证明
+     */
+    @ApiModelProperty("退役证明")
+    @Excel(name = "退役证明")
+    private String proof;
+
+    /**
+     * 身份证
+     */
+    @ApiModelProperty("身份证")
+    @Excel(name = "身份证")
+    private String idcard;
+
+    /**
+     * 材料
+     */
+    @ApiModelProperty("材料")
+    @Excel(name = "材料")
+    private String material;
+//
+//    /**
+//     * 保留字段1
+//     */
+//    @ApiModelProperty("保留字段1")
+//    @TableField("data1")
+//    @Excel(name = "保留字段1")
+//    private String data1;
+//
+//    /**
+//     * 保留字段2
+//     */
+//    @ApiModelProperty("保留字段2")
+//    @TableField("data2")
+//    @Excel(name = "保留字段2")
+//    private String data2;
+
+
+}
+
diff --git a/srs-routine/src/main/java/com/srs/routine/mapper/SysDisBasicMapper.java b/srs-routine/src/main/java/com/srs/routine/mapper/SysDisBasicMapper.java
index 4605834..1386431 100644
--- a/srs-routine/src/main/java/com/srs/routine/mapper/SysDisBasicMapper.java
+++ b/srs-routine/src/main/java/com/srs/routine/mapper/SysDisBasicMapper.java
@@ -24,6 +24,10 @@ public interface SysDisBasicMapper extends BaseMapper<SysDisBasic> {
     public SysDisBasic selectSysDisBasicById(Long id);
 
     public SysDisBasic selectSysDisBasicByStId(@Param("stId") String stId);
+
+    public SysDisBasic selectSysDisBasicByProcessInstanceId(@Param("processId") String processId);
+
+    public SysDisBasic selectSysDisBasicByStName(@Param("stName") String stName);
     /**
      * 查询退伍复学申请列表
      *
diff --git a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveService.java b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveService.java
index 24f4908..2424e9f 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveService.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveService.java
@@ -3,6 +3,7 @@ package com.srs.routine.service;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import com.srs.routine.domain.RtEnlistmentReserve;
 
 /**
@@ -67,4 +68,21 @@ public interface IRtEnlistmentReserveService extends IService<RtEnlistmentReserv
      * @return 结果
      */
     int deleteRtEnlistmentReserveById(Long id);
+
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    DmsOutsideAccommodationApply insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply);
 }
diff --git a/srs-routine/src/main/java/com/srs/routine/service/ISysDisBasicService.java b/srs-routine/src/main/java/com/srs/routine/service/ISysDisBasicService.java
index 0b82960..3a68118 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/ISysDisBasicService.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/ISysDisBasicService.java
@@ -20,6 +20,10 @@ public interface ISysDisBasicService extends IService<SysDisBasic> {
      */
     public SysDisBasic selectSysDisBasicById(Long id);
 
+    public SysDisBasic selectSysDisBasicByStName(String stName);
+
+    public SysDisBasic selectSysDisBasicByProcessInstanceId(String processId);
+
     /**
      * 查询退伍复学申请列表
      *
@@ -28,6 +32,8 @@ public interface ISysDisBasicService extends IService<SysDisBasic> {
      */
     List<SysDisBasic> selectSysDisBasicList(SysDisBasic sysDisBasic);
 
+
+
     /**
      * 新增退伍复学申请
      *
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/NotificationManagementServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/NotificationManagementServiceImpl.java
index d684ca6..8ab4fc9 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/NotificationManagementServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/NotificationManagementServiceImpl.java
@@ -243,9 +243,59 @@ public class NotificationManagementServiceImpl extends ServiceImpl<NotificationM
             List<String> batch = studentNos.subList(i, Math.min(i + batchSize, studentNos.size()));
             // 拼接成"2023001|2023002|2023003"格式
             String toUser = String.join("|", batch);
-            // 调用企业微信发送消息方法
-            weChatUtil.sendTextMessage(toUser, content);
+            // 如果内容包含超链接标签，转换为 Markdown
+            String md = convertHtmlLinkToMarkdown(content);
+            
+            try {
+                if (md != null) {
+                    weChatUtil.sendMarkdownMessage(toUser, md);
+                } else {
+                    // 如果没有标签但包含 http 链接，直接发送文本也可点击
+                    weChatUtil.sendTextMessage(toUser, content);
+                }
+            } catch (Exception e) {
+                // 记录错误但不抛出异常，避免影响其他批次或后续流程
+                System.err.println("批量发送企业微信消息失败 (batch " + i + "): " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
 
+    /**
+     * 将单个 a 标签的 HTML 转为 Markdown 格式；不匹配返回 null
+     */
+    private String convertHtmlLinkToMarkdown(String html) {
+        if (html == null) return null;
+        String lower = html.toLowerCase();
+        if (!lower.contains("<a")) return null;
+        try {
+            // 简单提取 href 与锚文本
+            int aStart = lower.indexOf("<a");
+            int hrefStart = lower.indexOf("href", aStart);
+            if (hrefStart < 0) return null;
+            int quoteStart = lower.indexOf("\"", hrefStart);
+            int quoteStartSingle = lower.indexOf("'", hrefStart);
+            int qs = -1, qe = -1;
+            if (quoteStart >= 0 && (quoteStartSingle < 0 || quoteStart < quoteStartSingle)) {
+                qs = quoteStart;
+                qe = lower.indexOf("\"", qs + 1);
+            } else if (quoteStartSingle >= 0) {
+                qs = quoteStartSingle;
+                qe = lower.indexOf("'", qs + 1);
+            }
+            if (qs < 0 || qe < 0) return null;
+            String url = html.substring(qs + 1, qe).trim();
+            int textStart = lower.indexOf(">", qe) + 1;
+            int textEnd = lower.indexOf("</a>", textStart);
+            if (textStart <= 0 || textEnd <= textStart) return null;
+            String text = html.substring(textStart, textEnd).trim();
+            // 其余文本去掉标签
+            String before = html.substring(0, aStart).replaceAll("<[^>]+>", "");
+            String after = html.substring(textEnd + 4).replaceAll("<[^>]+>", "");
+            String mdLink = "[" + (text.isEmpty() ? url : text) + "](" + url + ")";
+            return before + mdLink + after;
+        } catch (Exception e) {
+            return null;
         }
     }
 
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
index 3883a14..08caea1 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
@@ -10,6 +10,8 @@ import com.srs.common.doman.vo.TeacherVo;
 import com.srs.common.exception.ServiceException;
 import com.srs.common.utils.DateUtils;
 import com.srs.common.utils.SecurityUtils;
+import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
+import com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper;
 import com.srs.flowable.service.IFlowDefinitionService;
 import lombok.extern.slf4j.Slf4j;
 import com.srs.routine.mapper.RtStuLeaveApplicationMapper;
@@ -36,8 +38,8 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
     @Autowired
     private RtEnlistmentReserveMapper rtEnlistmentReserveMapper;
 
-//    @Autowired
-//    private RtStuLeaveApplicationMapper rtStuLeaveApplicationMapper;
+    @Autowired
+    private DmsOutsideAccommodationApplyMapper dmsOutsideAccommodationApplyMapper; // 外宿申请
 
     @Autowired
     IFlowDefinitionService flowDefinitionService;
@@ -49,7 +51,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
     IdentityService identityService;
 
 
-    // 新增：注入RuntimeService（之前缺失）
+    // 注入RuntimeService
     @Autowired
     private RuntimeService runtimeService;
 
@@ -177,6 +179,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
                     .processInstanceId(processInstanceId)
                     .taskAssignee(studentUserId) // 学生作为任务负责人
                     .active() // 仅查询活跃任务
+                    .taskName("学生申请")
                     .list();
 
             if (!studentTaskList.isEmpty()) {
@@ -381,4 +384,232 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
     public int deleteRtEnlistmentReserveById(Long id) {
         return rtEnlistmentReserveMapper.deleteRtEnlistmentReserveById(id);
     }
+
+    /**
+     * 新增外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Override
+    public DmsOutsideAccommodationApply insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
+        // 新增之前先查询申请记录是否存在，如果存在就不能新增重复的数据
+        DmsOutsideAccommodationApply outsideAccommodationApply = dmsOutsideAccommodationApplyMapper.getAccommodationByStuNameAndStuNo(dmsOutsideAccommodationApply.getStudentName(), dmsOutsideAccommodationApply.getStudentNo());
+        if (outsideAccommodationApply != null) {
+            throw new ServiceException("您已经申请过了，请勿重新申请！", 400);
+        }
+        dmsOutsideAccommodationApply.setCreateTime(DateUtils.getNowDate());
+        dmsOutsideAccommodationApply.setCreateBy(SecurityUtils.getUsername());
+        dmsOutsideAccommodationApply.setStartDate(DateUtils.getNowDate());
+
+        // 先插入申请表数据，获取自增 ID（数据库自动为 applyStatus 赋值 0 若未传值）
+        int insertCount = dmsOutsideAccommodationApplyMapper.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+        if (insertCount <= 0) {
+            throw new ServiceException("申请表插入失败", 500);
+        }
+
+        Long applyId = dmsOutsideAccommodationApply.getId();
+        if (applyId == null) {
+            throw new ServiceException("申请表 ID 生成失败，无法继续操作", 500);
+        }
+        // 仅当 applyStatus = 1 时，启动流程（1=提交申请，进入审批）
+        // 注意：若前端未传 applyStatus，数据库默认 0，不会触发流程
+        if (1 == dmsOutsideAccommodationApply.getStatus()) {
+            // 绑定当前学生 ID（提交人即学生本人，确保流程变量准确）
+            dmsOutsideAccommodationApply.setStudentId(SecurityUtils.getUserId());
+
+            // 启动流程（此时 applyId 已存在，可正常传递）
+            ProcessResultDto processResultDto = startOutsideAccommodationProcess(dmsOutsideAccommodationApply);
+
+            // 同步更新流程实例 ID + 申请状态为“审批中”（2），形成业务闭环
+            if (processResultDto != null && StringUtils.isNotBlank(processResultDto.getProcessInstanceId())) {
+                DmsOutsideAccommodationApply updateEntity = new DmsOutsideAccommodationApply();
+                updateEntity.setId(applyId);
+                updateEntity.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                updateEntity.setDeployId(processResultDto.getDeploymentId());
+                /*updateEntity.setApplyStatus(1L); // 审批中状态（根据实际枚举调整）*/
+                dmsOutsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(updateEntity);
+                System.out.println("申请表[" + applyId + "]已启动流程，实例ID：" + processResultDto.getProcessInstanceId() + "，状态更新为审批中");
+            } else {
+                throw new ServiceException("流程启动失败，请重试", 500);
+            }
+        } else {
+            // 若 applyStatus 为 0（数据库默认）或其他值，仅保存表单，不启动流程
+            String statusDesc = dmsOutsideAccommodationApply.getStatus() == 0 ? "草稿" : "待辅导员审批";
+            System.out.println("申请表[" + applyId + "]状态为" + dmsOutsideAccommodationApply.getStatus() + "（" + statusDesc + "），暂不启动流程");
+        }
+
+        return dmsOutsideAccommodationApply;
+    }
+
+    /**
+     * 修改外宿申请
+     *
+     * @param dmsOutsideAccommodationApply 外宿申请
+     * @return 结果
+     */
+    @Override
+    public int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
+        if (dmsOutsideAccommodationApply.getId() == null) {
+            throw new ServiceException("申请表ID不能为空，无法更新", 500);
+        }
+        dmsOutsideAccommodationApply.setUpdateTime(DateUtils.getNowDate());
+        dmsOutsideAccommodationApply.setUpdateBy(SecurityUtils.getUsername());
+
+        // 查询当前申请表的已有状态（判断流程是否已启动）
+        DmsOutsideAccommodationApply existing = dmsOutsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyById(dmsOutsideAccommodationApply.getId());
+        if (existing == null) {
+            throw new ServiceException("未查询到申请表数据，无法更新", 500);
+        }
+        // 判断流程是否已启动（存在 processInstanceId 即为已启动）
+        boolean isProcessStarted = StringUtils.isNotBlank(existing.getProcessInstanceId());
+
+        if (isProcessStarted) {
+            // 流程已启动：如果节点回到学生申请，则学生申请自动完成
+            System.out.println("申请表[" + dmsOutsideAccommodationApply.getId() + "]流程已启动（实例ID：" + existing.getProcessInstanceId() + "），仅更新数据");
+            // ========== 核心新增逻辑：仅当任务是「学生申请」节点时，学生自动完成待办任务 ==========
+            String processInstanceId = existing.getProcessInstanceId();
+            Long studentId = SecurityUtils.getUserId(); // 获取当前操作的学生ID
+            String studentUserId = studentId.toString(); // 转换为Flowable的Assignee字符串类型
+
+            // 1. 查询学生当前的待办任务（流程实例ID+学生ID作为负责人）（增加：任务名称/任务定义Key过滤，仅匹配「学生申请」节点）
+            List<Task> studentTaskList = taskService.createTaskQuery()
+                    .processInstanceId(processInstanceId)
+                    .taskAssignee(studentUserId) // 学生作为任务负责人
+                    .active() // 仅查询活跃任务
+                    .taskName("学生申请")
+                    .list();
+
+            if (!studentTaskList.isEmpty()) {
+                for (Task studentTask : studentTaskList) {
+                    // 补充完成任务的流程变量（如审批意见、结果，根据你的流程需求设置）
+                    Map<String, Object> completeVariables = new HashMap<>();
+                    completeVariables.put("approvalResult", "AGREE"); // 学生提交（默认同意）
+                    completeVariables.put("approvalOpinion", "学生自动提交申请，等待辅导员审批");
+                    completeVariables.put("operator", "student"); // 操作人类型
+                    // 添加任务分配的备注（便于流程追溯）
+                    taskService.addComment(
+                            studentTask.getId(),
+                            processInstanceId,
+                            "自动分配负责人",
+                            "学生已经重新修改提交申请"
+                    );
+                    // 2. 学生自动完成待办任务
+                    taskService.complete(studentTask.getId(), completeVariables);
+                    System.out.println("学生[" + studentUserId + "]已自动完成待办任务，任务ID：" + studentTask.getId());
+                }
+
+                // 3. 分配下一节点（辅导员）的待办任务负责人【不再复用监听器，独立实现】
+                assignCounselorTask(processInstanceId, existing.getId(), existing.getStudentNo());
+            } else {
+                System.out.println("流程实例[" + processInstanceId + "]中未查询到学生[" + studentUserId + "]的待办任务，无需自动完成");
+            }
+
+            // 同步更新流程变量（将业务表状态同步到流程中）
+            runtimeService.setVariable(processInstanceId, "applyStatus", dmsOutsideAccommodationApply.getStatus());
+            // 注意：若需更新流程相关变量，需调用 Flowable 的 runtimeService.setVariables()，此处仅更新业务表
+            return dmsOutsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+        } else {
+            // 流程未启动：仅当 applyStatus=1 时启动流程，否则仅更新数据
+            Long applyStatus = dmsOutsideAccommodationApply.getStatus();
+            if (1L == applyStatus) {
+                // 绑定当前学生ID，启动流程
+                dmsOutsideAccommodationApply.setStudentId(SecurityUtils.getUserId());
+                ProcessResultDto processResultDto = startOutsideAccommodationProcess(dmsOutsideAccommodationApply);
+                if (processResultDto == null || StringUtils.isBlank(processResultDto.getProcessInstanceId())) {
+                    throw new ServiceException("流程启动失败，请重试", 500);
+                }
+
+                // 关联流程实例ID，更新为“审批中”状态
+                dmsOutsideAccommodationApply.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                dmsOutsideAccommodationApply.setDeployId(processResultDto.getDeploymentId());
+                dmsOutsideAccommodationApply.setStatus(1L); // 审批中
+                System.out.println("申请表[" + dmsOutsideAccommodationApply.getId() + "]启动流程成功，实例ID：" + processResultDto.getProcessInstanceId());
+            } else {
+                // 非提交状态：仅更新基础数据（如草稿修改）
+                String statusDesc = applyStatus == null ? "未指定状态" : (applyStatus == 0 ? "草稿" : "其他状态");
+                System.out.println("申请表[" + dmsOutsideAccommodationApply.getId() + "]状态为" + statusDesc + "，流程未启动，仅更新数据");
+            }
+
+            // 执行数据库更新（含流程实例ID绑定或基础数据更新）
+            return dmsOutsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+        }
+
+    }
+
+
+    /**
+     * 开启外宿申请工作流
+     *
+     * @param dmsOutsideAccommodationApply
+     */
+    private ProcessResultDto startOutsideAccommodationProcess(DmsOutsideAccommodationApply
+                                                                      dmsOutsideAccommodationApply) {
+        Map<String, Object> variables = new HashMap<>();
+        // 1. 传递关键变量（申请编号+主键ID，用于任务匹配）
+        String applyNo = dmsOutsideAccommodationApply.getApplyNo(); // 申请编号（如RY2024001）
+        Long enlistmentId = dmsOutsideAccommodationApply.getId();   // 申请表主键ID
+        variables.put("applyNo", applyNo);
+        variables.put("accommodationId", enlistmentId); // 新增：用于任务匹配的主键变量
+        variables.put("stuId", dmsOutsideAccommodationApply.getStudentId());
+
+        // 2. 查询辅导员信息
+        TeacherVo counselorInfo = dmsOutsideAccommodationApplyMapper.getCounselorInfo(dmsOutsideAccommodationApply.getStudentNo());
+        if (counselorInfo == null) {
+            throw new ServiceException("该学生暂无辅导员", 500);
+        }
+        variables.put("approval", counselorInfo.getUserId()); // 下一节点：辅导员
+        variables.put("deptId", counselorInfo.getDeptId());
+
+        // 3. 启动流程
+        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_dre1txpk:11:1375008", variables);
+        String code = ajaxResult.get("code").toString();
+        if (!"200".equals(code)) {
+            throw new ServiceException("流程启动失败，错误码：" + code, 500);
+        }
+
+        ProcessResultDto dto = (ProcessResultDto) ajaxResult.get("data");
+        System.out.println("流程启动成功，实例ID：" + dto.getProcessInstanceId());
+
+        // 4. 学生自动完成自己的待办任务
+        identityService.setAuthenticatedUserId(SecurityUtils.getUserId().toString());
+        // 精准查询当前流程中属于学生的待办任务
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(dto.getProcessInstanceId())
+                .taskAssignee(SecurityUtils.getUserId().toString())
+                .active()
+                .list();
+
+        if (tasks.isEmpty()) {
+            throw new ServiceException("未查询到学生的待办任务，请检查流程设计", 500);
+        }
+
+        // 5. 完成任务（匹配主键ID，避免错误）
+        variables.put("approved", true); // 学生提交确认
+        for (Task task : tasks) {
+            // 安全获取变量：先判断是否为null，再转换类型
+            Object varValue = taskService.getVariable(task.getId(), "accommodationId");
+            if (varValue == null) {
+                continue;
+            }
+            // 转换为Long类型（与主键ID匹配）
+            Long taskEnlistmentId;
+            try {
+                taskEnlistmentId = Long.parseLong(varValue.toString());
+            } catch (NumberFormatException e) {
+                continue; // 类型不匹配，跳过
+            }
+            // 匹配当前申请表的主键ID
+            if (taskEnlistmentId.equals(enlistmentId)) {
+                taskService.complete(task.getId(), variables);
+                System.out.println("学生已完成待办任务，任务ID：" + task.getId());
+                break; // 完成后退出循环，避免重复处理
+            }
+        }
+
+        // 6. 推送消息给辅导员（待办提醒）
+        // todo: 企业微信推送逻辑
+
+        return dto;
+    }
 }
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryRelieveServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryRelieveServiceImpl.java
index 940b9db..95902cb 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryRelieveServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryRelieveServiceImpl.java
@@ -194,6 +194,7 @@ public class RtStuDisciplinaryRelieveServiceImpl extends ServiceImpl<RtStuDiscip
         variables.put("penaltyType", rtStuDisciplinaryRelieve.getPenaltyType());
         variables.put("stuUserId", SecurityUtils.getUserId());
 
+
         AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_d46199lc:18:832592", variables);
         String code = ajaxResult.get("code").toString();
         if (code.equals("200")) {
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/SysDisBasicServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/SysDisBasicServiceImpl.java
index f862a0a..cc8b1d8 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/SysDisBasicServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/SysDisBasicServiceImpl.java
@@ -3,7 +3,7 @@ package com.srs.routine.service.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
 
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.common.doman.dto.ProcessResultDto;
@@ -13,13 +13,15 @@ import com.srs.common.utils.SecurityUtils;
 import com.srs.flowable.service.IFlowDefinitionService;
 import com.srs.routine.mapper.RtEnlistmentReserveMapper;
 import com.srs.routine.mapper.RtStuLeaveApplicationMapper;
-import com.srs.routine.mapper.RtStuQuitSchoolMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.IdentityService;
+import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
+import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import com.srs.routine.mapper.SysDisBasicMapper;
 import com.srs.routine.domain.SysDisBasic;
@@ -37,6 +39,7 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
     @Autowired
     private SysDisBasicMapper sysDisBasicMapper;
 
+
     /**
      * 查询退伍复学申请
      *
@@ -48,6 +51,16 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
         return sysDisBasicMapper.selectSysDisBasicById(id);
     }
 
+    @Override
+    public SysDisBasic selectSysDisBasicByStName(String stName) {
+        return sysDisBasicMapper.selectSysDisBasicByStName(stName);
+    }
+
+    @Override
+    public SysDisBasic selectSysDisBasicByProcessInstanceId(String processId) {
+        return sysDisBasicMapper.selectSysDisBasicByProcessInstanceId(processId);
+    }
+
     /**
      * 查询退伍复学申请列表
      *
@@ -103,11 +116,11 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
      */
     @Override
     public int updateSysDisBasic(SysDisBasic sysDisBasic) {
-//        ProcessResultDto processResultDto = startBasicProcess(sysDisBasic);
-//        if (processResultDto != null){
-//            sysDisBasic.setProcessId(processResultDto.getProcessInstanceId());
-//            sysDisBasic.setDeployId(processResultDto.getDeploymentId());
-//        }
+        ProcessResultDto processResultDto = startBasicProcess(sysDisBasic);
+        if (processResultDto != null){
+            sysDisBasic.setProcessId(processResultDto.getProcessInstanceId());
+            sysDisBasic.setDeployId(processResultDto.getDeploymentId());
+        }
         return sysDisBasicMapper.updateSysDisBasic(sysDisBasic);
     }
 
@@ -152,69 +165,166 @@ public class SysDisBasicServiceImpl extends ServiceImpl<SysDisBasicMapper,SysDis
      *
      * @param
      */
-    private ProcessResultDto startBasicProcess(SysDisBasic sysDisBasic) {
+//    private ProcessResultDto startBasicProcess(SysDisBasic sysDisBasic) {
+//
+//        Map<String, Object> variables = new HashMap<>();
+//        variables.put("basicId", sysDisBasic.getId());
+//        variables.put("conversion", sysDisBasic.getConversion());
+//        variables.put("stuId", sysDisBasic.getStId());
+//
+//        if ("N".equals(sysDisBasic.getConversion())) { // 修复字符串比较方式
+//            TeacherVo counselorInfo = rtEnlistmentReserveMapper.getCounselorInfo(sysDisBasic.getStId());
+//            if (counselorInfo == null) {
+//                log.error("未查询到辅导员信息，stuId: {}", sysDisBasic.getStId());
+//                return null; // 避免空指针
+//            }
+//            variables.put("approval", counselorInfo.getUserId());
+//            variables.put("deptId", counselorInfo.getDeptId());
+//            // 无需重复设置 conversion = "N"，因为已经通过上面的代码设置过了
+//        }else {
+//            List<TeacherVo> zjcData = sysDisBasicMapper.getShenDataInfo("招就处");
+//            if (zjcData == null) {
+//                log.error("未查询到辅导员信息，stuId: {}", sysDisBasic.getStId());
+//                return null; // 避免空指针
+//            }
+//            variables.put("approval", zjcData.get(0).getUserId());
+//            variables.put("deptId", zjcData.get(0).getDeptId());
+//        }
+////
+//
+//        //flow_m4npextk:28:257686 flow_m4npextk:31:755004
+//        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_nrblbjev:15:1330041", variables);
+//        String code = ajaxResult.get("code").toString();
+//        if (code.equals("200")) {
+//
+//            log.info("流程启动成功");
+//
+//            Object obj = ajaxResult.get("data");
+//            ProcessResultDto dto = (ProcessResultDto) obj;
+//
+//            // 操作工作流
+//            // 设置当前用户
+//            identityService.setAuthenticatedUserId(SecurityUtils.getUserId().toString());
+//            // 查询待办任务列表
+//            List<Task> tasks = taskService.createTaskQuery()
+//                    .processInstanceId(dto.getProcessInstanceId())
+//                    .taskAssignee(SecurityUtils.getUserId().toString())
+//                    .active()
+//                    .list();
+//            // 保存审核结果到任务变量中
+//            variables.put("approved", true);
+//            // 完成待办任务列表
+//            for (Task task : tasks) {
+//                String taskId = task.getId();
+//                String leaveId = taskService.getVariable(taskId, "basicId").toString();
+//                if (leaveId.equals(sysDisBasic.getId().toString())) {
+//                    taskService.complete(task.getId(), variables);
+//                }
+//            }
+//
+//            // todo 企业微信推送消息
+//
+//
+//            return dto;
+//        } else {
+//            return null;
+//        }
+//    }
 
+    @Autowired
+    private RuntimeService runtimeService;
+
+    private ProcessResultDto startBasicProcess(SysDisBasic sysDisBasic) {
+        // 新增：核心唯一标识获取+空指针防护
+        Long applyId = sysDisBasic.getId();
+        String stId = sysDisBasic.getStId();
+        if (applyId == null || stId == null) {
+            log.error("申请ID/学生ID为空，无法启动工作流 - applyId: {}, stId: {}", applyId, stId);
+            return null;
+        }
+        String basicId = applyId.toString();
+
+        // --------------- 新增：启动前暴力清理该学生所有流程实例（核心拦截）---------------
+        List<ProcessInstance> duplicateInstances = runtimeService.createProcessInstanceQuery()
+                .variableValueEquals("stuId", stId) // 按学生ID精准匹配
+                .list();
+        for (ProcessInstance instance : duplicateInstances) {
+            log.warn("清理学生重复流程实例 - stId: {}, 实例ID: {}", stId, instance.getId());
+            runtimeService.deleteProcessInstance(instance.getId(), "同一学生重复提交清理");
+        }
+
+        // --------------- 原有变量构建（仅添加禁用回调标记）---------------
         Map<String, Object> variables = new HashMap<>();
         variables.put("basicId", sysDisBasic.getId());
         variables.put("conversion", sysDisBasic.getConversion());
         variables.put("stuId", sysDisBasic.getStId());
+        // 新增：禁用所有自动回调（切断框架触发重复的链路）
+        variables.put("skipFormCallback", true);
+        variables.put("noAutoCallback", true);
 
-        if ("N".equals(sysDisBasic.getConversion())) { // 修复字符串比较方式
+        // --------------- 原有审核人查询（优化空指针）---------------
+        if ("N".equals(sysDisBasic.getConversion())) {
             TeacherVo counselorInfo = rtEnlistmentReserveMapper.getCounselorInfo(sysDisBasic.getStId());
             if (counselorInfo == null) {
                 log.error("未查询到辅导员信息，stuId: {}", sysDisBasic.getStId());
-                return null; // 避免空指针
+                return null;
             }
             variables.put("approval", counselorInfo.getUserId());
             variables.put("deptId", counselorInfo.getDeptId());
-            // 无需重复设置 conversion = "N"，因为已经通过上面的代码设置过了
-        }else {
+        } else {
             List<TeacherVo> zjcData = sysDisBasicMapper.getShenDataInfo("招就处");
-            if (zjcData == null) {
-                log.error("未查询到辅导员信息，stuId: {}", sysDisBasic.getStId());
-                return null; // 避免空指针
+            // 修复：添加集合非空判断，避免IndexOutOfBoundsException
+            if (zjcData == null || zjcData.isEmpty()) {
+                log.error("未查询到招就处审核人信息，stuId: {}", sysDisBasic.getStId());
+                return null;
             }
             variables.put("approval", zjcData.get(0).getUserId());
             variables.put("deptId", zjcData.get(0).getDeptId());
         }
-//
 
-        //flow_m4npextk:28:257686 flow_m4npextk:31:755004
-        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_nrblbjev:14:1232527", variables);
+        // --------------- 原有流程启动逻辑（不变）---------------
+        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_nrblbjev:20:1347543", variables);
         String code = ajaxResult.get("code").toString();
         if (code.equals("200")) {
-
-            log.info("流程启动成功");
+            log.info("流程启动成功 - stId: {}, applyId: {}", stId, basicId);
 
             Object obj = ajaxResult.get("data");
             ProcessResultDto dto = (ProcessResultDto) obj;
 
             // 操作工作流
-            // 设置当前用户
             identityService.setAuthenticatedUserId(SecurityUtils.getUserId().toString());
-            // 查询待办任务列表
             List<Task> tasks = taskService.createTaskQuery()
                     .processInstanceId(dto.getProcessInstanceId())
                     .taskAssignee(SecurityUtils.getUserId().toString())
                     .active()
                     .list();
-            // 保存审核结果到任务变量中
-            variables.put("approved", true);
+
+            // --------------- 核心修改：删除approved变量，任务完成不传递任何参数 ---------------
+            // 注释掉：variables.put("approved", true); // 移除该变量，避免触发回调
+
             // 完成待办任务列表
             for (Task task : tasks) {
                 String taskId = task.getId();
-                String leaveId = taskService.getVariable(taskId, "basicId").toString();
-                if (leaveId.equals(sysDisBasic.getId().toString())) {
-                    taskService.complete(task.getId(), variables);
+                // 新增：变量非空校验，避免空指针
+                Object taskBasicIdObj = taskService.getVariable(taskId, "basicId");
+                if (taskBasicIdObj == null) {
+                    log.warn("任务变量basicId为空，跳过任务 - 任务ID: {}", taskId);
+                    continue;
+                }
+                String leaveId = taskBasicIdObj.toString();
+                if (leaveId.equals(basicId)) {
+                    // 核心修改：仅完成任务，不传递variables（切断回调触发重复）
+                    taskService.complete(task.getId());
+                    log.info("自动完成任务 - 任务ID: {}, 实例ID: {}", taskId, dto.getProcessInstanceId());
                 }
             }
 
             // todo 企业微信推送消息
-
-
             return dto;
         } else {
+            log.error("流程启动失败，响应码: {}", code);
             return null;
         }
     }
+
 }
diff --git a/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml b/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
index 7c68f08..84649a4 100644
--- a/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
@@ -48,8 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="conversion"    column="conversion"    />
         <result property="processId"    column="process_id"    />
         <result property="deployId"    column="deploy_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="testData"    column="test_data"    />
+        <result property="testTest"    column="test_test"    />
         <!--填报退伍材料-->
         <collection property="MaList" column="{stId = st_id}" javaType="java.util.ArrayList" select="selectMateById"/>
+
     </resultMap>
 
     <!--    联表 材料上传-->
@@ -81,20 +85,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <!--查询是否插入过记录-->
+    <select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        <where>
+            <if test="stId != null and stId != ''">
+                and st_id = #{stId}
+            </if>
 
-    <sql id="selectSysDisBasicVo">
-        select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id from sys_dis_basic
-    </sql>
-
-    <select id="getCounselorInfo" resultType="com.srs.common.doman.vo.TeacherVo">
-        SELECT d.user_id userId, d.dept_id deptId, d.user_name userName, d.nick_name nickName
-        FROM srs_student a
-        LEFT JOIN srs_class b ON a.class_id = b.class_id
-        LEFT JOIN cph_teacher c ON b.teacher_id = c.teacher_id
-        LEFT JOIN sys_user d ON c.employee_id = d.user_name
-        WHERE a.stu_id = #{stId}
+        </where>
     </select>
 
+    <!--    根据姓名查询信息-->
+    <select id="selectSysDisBasicByStName" parameterType="String" resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        <where>
+            <if test="stName != null and stName != ''">
+                and st_name = #{stName}
+            </if>
+
+        </where>
+    </select>
+
+    <!--  根据流程编号查询申请记录  -->
+    <select id="selectSysDisBasicByProcessInstanceId" parameterType="String"
+            resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        where process_id = #{processId}
+    </select>
+
+    <!-- 获取审批用户信息 -->
+    <select id="getShenDataInfo" resultType="com.srs.common.doman.vo.TeacherVo">
+        SELECT a.user_id userId, a.dept_id deptId, a.nick_name userNick, a.user_name userName
+        FROM sys_user a
+        LEFT JOIN sys_user_role b ON a.user_id = b.user_id
+        LEFT JOIN sys_role c ON b.role_id = c.role_id
+        WHERE c.role_name = #{roleName}
+    </select>
+
+
+
+    <sql id="selectSysDisBasicVo">
+        select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id, student_id, test_data, test_test from sys_dis_basic
+    </sql>
 
     <select id="selectSysDisBasicList" parameterType="SysDisBasic" resultMap="SysDisBasicResult">
         <include refid="selectSysDisBasicVo"/>
@@ -141,6 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null  and conversion != ''"> and conversion = #{conversion}</if>
             <if test="processId != null  and processId != ''"> and process_id = #{processId}</if>
             <if test="deployId != null  and deployId != ''"> and deploy_id = #{deployId}</if>
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="testData != null  and testData != ''"> and test_data = #{testData}</if>
+            <if test="testTest != null  and testTest != ''"> and test_test = #{testTest}</if>
         </where>
     </select>
     
@@ -148,28 +184,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysDisBasicVo"/>
         where id = #{id}
     </select>
-
-    <!--查询是否插入过记录-->
-    <select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
-        <include refid="selectSysDisBasicVo"/>
-        <where>
-            <if test="stId != null and stId != ''">
-                and st_id = #{stId}
-            </if>
-
-        </where>
-    </select>
-
-
-    <!-- 获取审批用户信息 -->
-    <select id="getShenDataInfo" resultType="com.srs.common.doman.vo.TeacherVo">
-        SELECT a.user_id userId, a.dept_id deptId, a.nick_name userNick, a.user_name userName
-        FROM sys_user a
-        LEFT JOIN sys_user_role b ON a.user_id = b.user_id
-        LEFT JOIN sys_role c ON b.role_id = c.role_id
-        WHERE c.role_name = #{roleName}
-    </select>
-
         
     <insert id="insertSysDisBasic" parameterType="SysDisBasic" useGeneratedKeys="true" keyProperty="id">
         insert into sys_dis_basic
@@ -216,6 +230,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">conversion,</if>
             <if test="processId != null">process_id,</if>
             <if test="deployId != null">deploy_id,</if>
+            <if test="studentId != null">student_id,</if>
+            <if test="testData != null">test_data,</if>
+            <if test="testTest != null">test_test,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fxId != null">#{fxId},</if>
@@ -260,6 +277,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">#{conversion},</if>
             <if test="processId != null">#{processId},</if>
             <if test="deployId != null">#{deployId},</if>
+            <if test="studentId != null">#{studentId},</if>
+            <if test="testData != null">#{testData},</if>
+            <if test="testTest != null">#{testTest},</if>
          </trim>
     </insert>
 
@@ -308,6 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">conversion = #{conversion},</if>
             <if test="processId != null">process_id = #{processId},</if>
             <if test="deployId != null">deploy_id = #{deployId},</if>
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="testData != null">test_data = #{testData},</if>
+            <if test="testTest != null">test_test = #{testTest},</if>
         </trim>
         where id = #{id}
     </update>
@@ -322,4 +345,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java b/srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java
index 02fd8cb..656cd71 100644
--- a/srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java
+++ b/srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java
@@ -147,7 +147,7 @@ public class SurItineraryServiceImpl extends ServiceImpl<SurItineraryMapper, Sur
             int batchSize = 900;
             SurSurvey surSurvey = surSurveyMapper.selectById(param.surveyId);
             String msg = "你还未填写" + surSurvey.getSurveyName()
-                    + "去向调查，请<a href=\"http://zhxg.gxsdxy.cn/wab/#/pages/sub/StuApply\">点击前往</a>填写";
+                    + "去向调查，请<a href=\"https://zhxg.gxsdxy.cn/wab/#/pages/sub/StuApply\">点击前往</a>填写";
 
             // List<String> test = new ArrayList<>();
             // test.add("20240116");
@@ -245,7 +245,7 @@ public class SurItineraryServiceImpl extends ServiceImpl<SurItineraryMapper, Sur
             int batchSize = 900;
             SurSurvey surSurvey = surSurveyMapper.selectById(param.surveyId);
             String msg = "你还未填写" + surSurvey.getSurveyName()
-                    + "去向调查，请<a href=\\\"http://zhxg.gxsdxy.cn/wab/#/pages/sub/StuApply\\\">点击前往</a>填写";
+                    + "去向调查，请<a href=\\\"https://zhxg.gxsdxy.cn/wab/#/pages/sub/StuApply\\\">点击前往</a>填写";
 
             for (int i = 0; i < notStuNos.size(); i += batchSize) {
                 List<String> batch = notStuNos.subList(i, Math.min(i + batchSize, stuNos.size()));
diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherBasicmessage.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherBasicmessage.java
index 395f3cb..ef7513d 100644
--- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherBasicmessage.java
+++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherBasicmessage.java
@@ -164,6 +164,14 @@ private static final long serialVersionUID=1L;
     @Excel(name = "岗位性质")
     private String jobNature;
 
+    /**
+     * 职业技术职称
+     */
+    @ApiModelProperty("职称")
+    @TableField("professional_title")
+    @Excel(name = "职称")
+    private String professionalTitle;
+
     /**
      * 参加工作时间
      */
diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherBasicmessageMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherBasicmessageMapper.xml
index 0cce4b9..0afa32b 100644
--- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherBasicmessageMapper.xml
+++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherBasicmessageMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.teacher.mapper.SysTeacherBasicmessageMapper">
-    
+
     <resultMap type="SysTeacherBasicmessage" id="SysTeacherBasicmessageResult">
         <result property="teacherId"    column="teacher_id"    />
         <result property="name"    column="name"    />
@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="level2units"    column="level2units"    />
         <result property="serviceHours"    column="serviceHours"    />
         <result property="jobNature"    column="jobNature"    />
+        <result property="professionalTitle"    column="professional_title"    />
         <result property="joinWorkHours"    column="joinWorkHours"    />
         <result property="highestEducation"    column="highestEducation"    />
         <result property="educated"    column="educated"    />
@@ -46,12 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysTeacherBasicmessageVo">
-        select teacher_id, name, gender, birthday, nation, photo, political, wechat, phone, address, identity, qqnumber, marriage, anotherDuties, level2units, serviceHours, jobNature, joinWorkHours, highestEducation, educated, study, lastestEducation, awardingInstitutions, email, college from sys_teacher_basicmessage
+        select teacher_id, name, gender, birthday, nation, photo, political, wechat, phone, address, identity, qqnumber, marriage, anotherDuties, level2units, serviceHours, jobNature, professional_title, joinWorkHours, highestEducation, educated, study, lastestEducation, awardingInstitutions, email, college from sys_teacher_basicmessage
     </sql>
 
     <select id="selectSysTeacherBasicmessageList" parameterType="SysTeacherBasicmessage" resultMap="SysTeacherBasicmessageResult">
         <include refid="selectSysTeacherBasicmessageVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="level2units != null  and level2units != ''"> and level2units = #{level2units}</if>
             <if test="serviceHours != null  and serviceHours != ''"> and serviceHours = #{serviceHours}</if>
             <if test="jobNature != null  and jobNature != ''"> and jobNature = #{jobNature}</if>
+            <if test="professionalTitle != null  and professionalTitle != ''"> and professional_title = #{professionalTitle}</if>
             <if test="joinWorkHours != null  and joinWorkHours != ''"> and joinWorkHours = #{joinWorkHours}</if>
             <if test="highestEducation != null  and highestEducation != ''"> and highestEducation = #{highestEducation}</if>
             <if test="educated != null  and educated != ''"> and educated = #{educated}</if>
@@ -78,15 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="college != null  and college != ''"> and college = #{college}</if>
         </where>
     </select>
-    
+
     <select id="selectSysTeacherBasicmessageByTeacherId" parameterType="Long" resultMap="SysTeacherBasicmessageSysTeacherTakeclassResult">
-        select a.teacher_id, a.name, a.gender, a.birthday, a.nation, a.photo, a.political, a.wechat, a.phone, a.address, a.identity, a.qqnumber, a.marriage, a.anotherDuties, a.level2units, a.serviceHours, a.jobNature, a.joinWorkHours, a.highestEducation, a.educated, a.study, a.lastestEducation, a.awardingInstitutions, a.email, a.college,
+        select a.teacher_id, a.name, a.gender, a.birthday, a.nation, a.photo, a.political, a.wechat, a.phone, a.address, a.identity, a.qqnumber, a.marriage, a.anotherDuties, a.level2units, a.serviceHours, a.jobNature, a.professional_title, a.joinWorkHours, a.highestEducation, a.educated, a.study, a.lastestEducation, a.awardingInstitutions, a.email, a.college,
  b.takeclass_id as sub_takeclass_id, b.teacher_id as sub_teacher_id, b.college as sub_college, b.grade as sub_grade, b.classteam as sub_classteam, b.number as sub_number
         from sys_teacher_basicmessage a
         left join sys_teacher_takeclass b on b.teacher_id = a.teacher_id
         where a.teacher_id = #{teacherId}
     </select>
-        
+
     <insert id="insertSysTeacherBasicmessage" parameterType="SysTeacherBasicmessage" useGeneratedKeys="true" keyProperty="teacherId">
         insert into sys_teacher_basicmessage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -107,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="level2units != null">level2units,</if>
             <if test="serviceHours != null">serviceHours,</if>
             <if test="jobNature != null">jobNature,</if>
+            <if test="professionalTitle != null">professional_title,</if>
             <if test="joinWorkHours != null">joinWorkHours,</if>
             <if test="highestEducation != null">highestEducation,</if>
             <if test="educated != null">educated,</if>
@@ -134,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="level2units != null">#{level2units},</if>
             <if test="serviceHours != null">#{serviceHours},</if>
             <if test="jobNature != null">#{jobNature},</if>
+            <if test="professionalTitle != null">#{professionalTitle},</if>
             <if test="joinWorkHours != null">#{joinWorkHours},</if>
             <if test="highestEducation != null">#{highestEducation},</if>
             <if test="educated != null">#{educated},</if>
@@ -164,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="level2units != null">level2units = #{level2units},</if>
             <if test="serviceHours != null">serviceHours = #{serviceHours},</if>
             <if test="jobNature != null">jobNature = #{jobNature},</if>
+            <if test="professionalTitle != null">professional_title = #{professionalTitle},</if>
             <if test="joinWorkHours != null">joinWorkHours = #{joinWorkHours},</if>
             <if test="highestEducation != null">highestEducation = #{highestEducation},</if>
             <if test="educated != null">educated = #{educated},</if>
@@ -181,14 +186,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSysTeacherBasicmessageByTeacherIds" parameterType="String">
-        delete from sys_teacher_basicmessage where teacher_id in 
+        delete from sys_teacher_basicmessage where teacher_id in
         <foreach item="teacherId" collection="array" open="(" separator="," close=")">
             #{teacherId}
         </foreach>
     </delete>
-    
+
     <delete id="deleteSysTeacherTakeclassByTeacherIds" parameterType="String">
-        delete from sys_teacher_takeclass where teacher_id in 
+        delete from sys_teacher_takeclass where teacher_id in
         <foreach item="teacherId" collection="array" open="(" separator="," close=")">
             #{teacherId}
         </foreach>
@@ -204,4 +209,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( #{item.takeclassId}, #{item.teacherId}, #{item.college}, #{item.grade}, #{item.classteam}, #{item.number})
         </foreach>
     </insert>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java b/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java
index acf29ad..fefa2fc 100644
--- a/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java
+++ b/srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxStuPostServiceImpl.java
@@ -218,7 +218,7 @@ public class QgzxStuPostServiceImpl extends ServiceImpl<QgzxStuPostMapper, QgzxS
                     Long postId = stuPost.getPostId();
                     Long zdlsYes = qgzxStuPostMapper.countZdlsYes(postId);
                     if (zdlsYes >= Integer.parseInt(post.postCount)) {
-                        throw new Exception("该岗位已有别的记录被其指导老师审核通过，不能申请通过");
+                        throw new Exception("请检查该岗位的在岗人数是否正确");
                     }
 
                     param.applyStatus = QgzxApplyStatus.INSTRUCTOR_APPROVED.getCode();