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
index 8b1584e..11df233 100644
--- a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java
@@ -1,6 +1,7 @@
 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.*;
@@ -10,22 +11,21 @@ import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
 
-
 /**
  * 外宿申请对象 dms_outside_accommodation_apply
  *
  * @author srs
- * @date 2025-12-05
+ * @date 2025-12-06
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value = "DmsOutsideAccommodationApply对象" , description = "外宿申请表")
+@ApiModel(value = "DmsOutsideAccommodationApply对象", description = "外宿申请表")
 @TableName("dms_outside_accommodation_apply")
-public class DmsOutsideAccommodationApply extends BaseEntity{
-private static final long serialVersionUID=1L;
+public class DmsOutsideAccommodationApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键ID
@@ -39,7 +39,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("申请编号（唯一，如WS20240001）")
     @TableField("apply_no")
-    @Excel(name = "申请编号" , readConverterExp = "唯=一，如WS20240001")
+    @Excel(name = "申请编号", readConverterExp = "唯=一，如WS20240001")
     private String applyNo;
 
     /**
@@ -47,7 +47,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("学生ID（关联学生表）")
     @TableField("student_id")
-    @Excel(name = "学生ID" , readConverterExp = "关=联学生表")
+    @Excel(name = "学生ID", readConverterExp = "关=联学生表")
     private Long studentId;
 
     /**
@@ -71,7 +71,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("性别（男/女）")
     @TableField("gender")
-    @Excel(name = "性别" , readConverterExp = "男=/女")
+    @Excel(name = "性别", readConverterExp = "男=/女")
     private String gender;
 
     /**
@@ -80,7 +80,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("出生年月")
     @TableField("birth_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生年月" , width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
     private Date birthDate;
 
     /**
@@ -136,15 +136,23 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("原宿舍号（如：1栋302）")
     @TableField("original_dormitory")
-    @Excel(name = "原宿舍号" , readConverterExp = "如=：1栋302")
+    @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=未交")
+    @Excel(name = "住宿费缴纳状态", readConverterExp = "1==已交，0=未交")
     private Long accommodationFeeStatus;
 
     /**
@@ -160,40 +168,16 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("外宿详细地址（精确至门牌号）")
     @TableField("outside_address")
-    @Excel(name = "外宿详细地址" , readConverterExp = "精=确至门牌号")
+    @Excel(name = "外宿详细地址", readConverterExp = "精=确至门牌号")
     private String outsideAddress;
 
     /**
-     * 外宿地址-省
+     * 外宿地址-省市区/县
      */
-    @ApiModelProperty("外宿地址-省")
-    @TableField("province")
-    @Excel(name = "外宿地址-省")
-    private String province;
-
-    /**
-     * 外宿地址-市
-     */
-    @ApiModelProperty("外宿地址-市")
-    @TableField("city")
-    @Excel(name = "外宿地址-市")
-    private String city;
-
-    /**
-     * 外宿地址-区/县
-     */
-    @ApiModelProperty("外宿地址-区/县")
-    @TableField("district")
-    @Excel(name = "外宿地址-区/县")
-    private String district;
-
-    /**
-     * 外宿紧急联系人
-     */
-    @ApiModelProperty("外宿紧急联系人")
-    @TableField("emergency_contact")
-    @Excel(name = "外宿紧急联系人")
-    private String emergencyContact;
+    @ApiModelProperty("外宿地址-省市区/县")
+    @TableField("address")
+    @Excel(name = "外宿地址-省市区/县")
+    private String address;
 
     /**
      * 紧急联系人电话
@@ -203,12 +187,20 @@ private static final long serialVersionUID=1L;
     @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=不同意")
+    @Excel(name = "家长意见", readConverterExp = "1==同意，0=不同意")
     private Long parentOpinion;
 
     /**
@@ -228,28 +220,12 @@ private static final long serialVersionUID=1L;
     private String parentPhone;
 
     /**
-     * 家长通讯地址-省
+     * 家长通讯地址-省市区/县
      */
-    @ApiModelProperty("家长通讯地址-省")
-    @TableField("parent_province")
-    @Excel(name = "家长通讯地址-省")
-    private String parentProvince;
-
-    /**
-     * 家长通讯地址-市
-     */
-    @ApiModelProperty("家长通讯地址-市")
-    @TableField("parent_city")
-    @Excel(name = "家长通讯地址-市")
-    private String parentCity;
-
-    /**
-     * 家长通讯地址-区/县
-     */
-    @ApiModelProperty("家长通讯地址-区/县")
-    @TableField("parent_district")
-    @Excel(name = "家长通讯地址-区/县")
-    private String parentDistrict;
+    @ApiModelProperty("家长通讯地址-省市区/县")
+    @TableField("parent_address")
+    @Excel(name = "家长通讯地址-省市区/县")
+    private String parentAddress;
 
     /**
      * 家长通讯地址-详细地址
@@ -273,7 +249,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("承诺签署日期")
     @TableField("promise_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "承诺签署日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "承诺签署日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date promiseDate;
 
     /**
@@ -282,7 +258,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("外宿开始时间")
     @TableField("start_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "外宿开始时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "外宿开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startDate;
 
     /**
@@ -290,7 +266,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("外宿结束时间（默认次年8月31日）")
     @TableField("end_date")
-    @Excel(name = "外宿结束时间" , readConverterExp = "默=认次年8月31日")
+    @Excel(name = "外宿结束时间", readConverterExp = "默=认次年8月31日")
     private Date endDate;
 
     /**
@@ -298,7 +274,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("申请状态（0=草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回）")
     @TableField("status")
-    @Excel(name = "申请状态" , readConverterExp = "0==草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回")
+    @Excel(name = "申请状态", readConverterExp = "0==草稿，1=待辅导员审批，2=待学院书记审批，3=待学工处审批，4=待学校领导审批，5=审批通过，6=审批驳回")
     private Long status;
 
     /**
@@ -314,7 +290,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("是否有效（1=有效，0=失效/到期）")
     @TableField("is_valid")
-    @Excel(name = "是否有效" , readConverterExp = "1==有效，0=失效/到期")
+    @Excel(name = "是否有效", readConverterExp = "1==有效，0=失效/到期")
     private Long isValid;
 
     /**
@@ -349,5 +325,29 @@ private static final long serialVersionUID=1L;
     @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/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
index 27bfb6d..226b78e 100644
--- 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
@@ -3,6 +3,7 @@ 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;
@@ -17,7 +18,7 @@ import com.srs.dormitory.service.IDmsOutsideAccommodationApplyService;
  * @date 2025-12-05
  */
 @Service
-public class DmsOutsideAccommodationApplyServiceImpl extends ServiceImpl<DmsOutsideAccommodationApplyMapper,DmsOutsideAccommodationApply> implements IDmsOutsideAccommodationApplyService {
+public class DmsOutsideAccommodationApplyServiceImpl extends ServiceImpl<DmsOutsideAccommodationApplyMapper, DmsOutsideAccommodationApply> implements IDmsOutsideAccommodationApplyService {
     @Autowired
     private DmsOutsideAccommodationApplyMapper dmsOutsideAccommodationApplyMapper;
 
@@ -51,8 +52,9 @@ public class DmsOutsideAccommodationApplyServiceImpl extends ServiceImpl<DmsOuts
      */
     @Override
     public int insertDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
-                dmsOutsideAccommodationApply.setCreateTime(DateUtils.getNowDate());
-            return dmsOutsideAccommodationApplyMapper.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
+        dmsOutsideAccommodationApply.setCreateTime(DateUtils.getNowDate());
+        dmsOutsideAccommodationApply.setCreateBy(SecurityUtils.getUsername());
+        return dmsOutsideAccommodationApplyMapper.insertDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
     }
 
     /**
@@ -63,7 +65,7 @@ public class DmsOutsideAccommodationApplyServiceImpl extends ServiceImpl<DmsOuts
      */
     @Override
     public int updateDmsOutsideAccommodationApply(DmsOutsideAccommodationApply dmsOutsideAccommodationApply) {
-                dmsOutsideAccommodationApply.setUpdateTime(DateUtils.getNowDate());
+        dmsOutsideAccommodationApply.setUpdateTime(DateUtils.getNowDate());
         return dmsOutsideAccommodationApplyMapper.updateDmsOutsideAccommodationApply(dmsOutsideAccommodationApply);
     }
 
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
index aaf0f86..97c47b3 100644
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
@@ -1,111 +1,178 @@
 <?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">
+        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="accommodationFeeStatus"    column="accommodation_fee_status"    />
-        <result property="applyReason"    column="apply_reason"    />
-        <result property="outsideAddress"    column="outside_address"    />
-        <result property="province"    column="province"    />
-        <result property="city"    column="city"    />
-        <result property="district"    column="district"    />
-        <result property="emergencyContact"    column="emergency_contact"    />
-        <result property="emergencyPhone"    column="emergency_phone"    />
-        <result property="parentOpinion"    column="parent_opinion"    />
-        <result property="parentSignAttachment"    column="parent_sign_attachment"    />
-        <result property="parentPhone"    column="parent_phone"    />
-        <result property="parentProvince"    column="parent_province"    />
-        <result property="parentCity"    column="parent_city"    />
-        <result property="parentDistrict"    column="parent_district"    />
-        <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="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_status, apply_reason, outside_address, province, city, district, emergency_contact, emergency_phone, parent_opinion, parent_sign_attachment, parent_phone, parent_province, parent_city, parent_district, 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 from dms_outside_accommodation_apply
+        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">
+    <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="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="province != null  and province != ''"> and province = #{province}</if>
-            <if test="city != null  and city != ''"> and city = #{city}</if>
-            <if test="district != null  and district != ''"> and district = #{district}</if>
-            <if test="emergencyContact != null  and emergencyContact != ''"> and emergency_contact = #{emergencyContact}</if>
-            <if test="emergencyPhone != null  and emergencyPhone != ''"> and emergency_phone = #{emergencyPhone}</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="parentProvince != null  and parentProvince != ''"> and parent_province = #{parentProvince}</if>
-            <if test="parentCity != null  and parentCity != ''"> and parent_city = #{parentCity}</if>
-            <if test="parentDistrict != null  and parentDistrict != ''"> and parent_district = #{parentDistrict}</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>
+        <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">
+
+    <select id="selectDmsOutsideAccommodationApplyById" parameterType="Long"
+            resultMap="DmsOutsideAccommodationApplyResult">
         <include refid="selectDmsOutsideAccommodationApplyVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertDmsOutsideAccommodationApply" parameterType="DmsOutsideAccommodationApply" useGeneratedKeys="true" keyProperty="id">
+
+    <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>
@@ -121,20 +188,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="province != null and province != ''">province,</if>
-            <if test="city != null and city != ''">city,</if>
-            <if test="district != null and district != ''">district,</if>
-            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact,</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="parentProvince != null and parentProvince != ''">parent_province,</if>
-            <if test="parentCity != null and parentCity != ''">parent_city,</if>
-            <if test="parentDistrict != null and parentDistrict != ''">parent_district,</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>
@@ -151,7 +215,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="affixId != null">affix_id,</if>
             <if test="deployId != null">deploy_id,</if>
             <if test="processInstanceId != null">process_instance_id,</if>
-         </trim>
+            <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>
@@ -166,20 +233,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="province != null and province != ''">#{province},</if>
-            <if test="city != null and city != ''">#{city},</if>
-            <if test="district != null and district != ''">#{district},</if>
-            <if test="emergencyContact != null and emergencyContact != ''">#{emergencyContact},</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="parentProvince != null and parentProvince != ''">#{parentProvince},</if>
-            <if test="parentCity != null and parentCity != ''">#{parentCity},</if>
-            <if test="parentDistrict != null and parentDistrict != ''">#{parentDistrict},</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>
@@ -196,7 +260,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="affixId != null">#{affixId},</if>
             <if test="deployId != null">#{deployId},</if>
             <if test="processInstanceId != null">#{processInstanceId},</if>
-         </trim>
+            <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="DmsOutsideAccommodationApply">
@@ -214,23 +281,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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="province != null and province != ''">province = #{province},</if>
-            <if test="city != null and city != ''">city = #{city},</if>
-            <if test="district != null and district != ''">district = #{district},</if>
-            <if test="emergencyContact != null and emergencyContact != ''">emergency_contact = #{emergencyContact},</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="parentSignAttachment != null and parentSignAttachment != ''">parent_sign_attachment =
+                #{parentSignAttachment},
+            </if>
             <if test="parentPhone != null and parentPhone != ''">parent_phone = #{parentPhone},</if>
-            <if test="parentProvince != null and parentProvince != ''">parent_province = #{parentProvince},</if>
-            <if test="parentCity != null and parentCity != ''">parent_city = #{parentCity},</if>
-            <if test="parentDistrict != null and parentDistrict != ''">parent_district = #{parentDistrict},</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="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>
@@ -245,16 +317,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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
+        from dms_outside_accommodation_apply
+        where id = #{id}
     </delete>
 
     <delete id="deleteDmsOutsideAccommodationApplyByIds" parameterType="String">
-        delete from dms_outside_accommodation_apply where id in 
+        delete from dms_outside_accommodation_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>