From a7a20cd575c5c24034ada0e0fa7fe8f4a2e59ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Fri, 3 Apr 2026 13:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/DmsOutsideAccommodationApply.java | 32 +++++++++++++++++++
.../DmsOutsideAccommodationApplyMapper.xml | 26 +++++++++++++++
2 files changed, 58 insertions(+)
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 14553d7..46f86bb 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
@@ -140,6 +140,14 @@ public class DmsOutsideAccommodationApply extends BaseEntity {
@Excel(name = "原宿舍号", readConverterExp = "如=：1栋302")
private String originalDormitory;
+ /**
+ * 是否保留原床位（1=保留,0=不保留）
+ */
+ @ApiModelProperty("是否保留原床位（1=保留,0=不保留）")
+ @TableField("keep_original_bed")
+ @Excel(name = "是否保留原床位" , readConverterExp = "1==保留,0=不保留")
+ private Long keepOriginalBed;
+
/**
* 住宿费缴纳
*/
@@ -164,6 +172,14 @@ public class DmsOutsideAccommodationApply extends BaseEntity {
@Excel(name = "外宿原因")
private String applyReason;
+ /**
+ * 外宿条件（1=疾病,2=居家,3=其他）
+ */
+ @ApiModelProperty("外宿条件（1=疾病,2=居家,3=其他）")
+ @TableField("outside_condition")
+ @Excel(name = "外宿条件" , readConverterExp = "1==疾病,2=居家,3=其他")
+ private Long outsideCondition;
+
/**
* 外宿详细地址（精确至门牌号）
*/
@@ -220,6 +236,22 @@ public class DmsOutsideAccommodationApply extends BaseEntity {
@Excel(name = "家长联系电话")
private String parentPhone;
+ /**
+ * 家长姓名
+ */
+ @ApiModelProperty("家长姓名")
+ @TableField("parent_name")
+ @Excel(name = "家长姓名")
+ private String parentName;
+
+ /**
+ * 家长与学生关系（父亲/母亲/监护人等）
+ */
+ @ApiModelProperty("家长与学生关系（父亲/母亲/监护人等）")
+ @TableField("parent_relation")
+ @Excel(name = "家长与学生关系" , readConverterExp = "父=亲/母亲/监护人等")
+ private String parentRelation;
+
/**
* 家长通讯地址-省市区/县
*/
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
index b24e915..46fda40 100644
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
@@ -19,9 +19,11 @@
+
+
@@ -29,6 +31,8 @@
+
+
@@ -138,9 +142,11 @@
class_id,
class_name,
original_dormitory,
+ keep_original_bed,
accommodation_fee,
accommodation_fee_status,
apply_reason,
+ outside_condition,
outside_address,
address,
emergency_phone,
@@ -148,6 +154,8 @@
parent_opinion,
parent_sign_attachment,
parent_phone,
+ parent_name,
+ parent_relation,
parent_address,
parent_detail_address,
student_promise_sign,
@@ -193,11 +201,13 @@
and original_dormitory =
#{originalDormitory}
+ and keep_original_bed = #{keepOriginalBed}
and accommodation_fee =
#{accommodationFee}
and accommodation_fee_status = #{accommodationFeeStatus}
and apply_reason = #{applyReason}
+ and outside_condition = #{outsideCondition}
and outside_address = #{outsideAddress}
and address = #{address}
and emergency_phone = #{emergencyPhone}
@@ -209,6 +219,9 @@
#{parentSignAttachment}
and parent_phone = #{parentPhone}
+ and parent_name like concat('%', #{parentName}, '%')
+
+ and parent_relation = #{parentRelation}
and parent_address = #{parentAddress}
and parent_detail_address =
#{parentDetailAddress}
@@ -235,6 +248,7 @@
and student_signature =
#{studentSignature}
+ and promise_content = #{promiseContent}
@@ -293,9 +307,11 @@
class_id,
class_name,
original_dormitory,
+ keep_original_bed,
accommodation_fee,
accommodation_fee_status,
apply_reason,
+ outside_condition,
outside_address,
address,
emergency_phone,
@@ -303,6 +319,8 @@
parent_opinion,
parent_sign_attachment,
parent_phone,
+ parent_name,
+ parent_relation,
parent_address,
parent_detail_address,
student_promise_sign,
@@ -339,9 +357,11 @@
#{classId},
#{className},
#{originalDormitory},
+ #{keepOriginalBed},
#{accommodationFee},
#{accommodationFeeStatus},
#{applyReason},
+ #{outsideCondition},
#{outsideAddress},
#{address},
#{emergencyPhone},
@@ -349,6 +369,8 @@
#{parentOpinion},
#{parentSignAttachment},
#{parentPhone},
+ #{parentName},
+ #{parentRelation},
#{parentAddress},
#{parentDetailAddress},
#{studentPromiseSign},
@@ -391,9 +413,11 @@
original_dormitory =
#{originalDormitory},
+ keep_original_bed = #{keepOriginalBed},
accommodation_fee = #{accommodationFee},
accommodation_fee_status = #{accommodationFeeStatus},
apply_reason = #{applyReason},
+ outside_condition = #{outsideCondition},
outside_address = #{outsideAddress},
address = #{address},
emergency_phone = #{emergencyPhone},
@@ -403,6 +427,8 @@
#{parentSignAttachment},
parent_phone = #{parentPhone},
+ parent_name = #{parentName},
+ parent_relation = #{parentRelation},
parent_address = #{parentAddress},
parent_detail_address =
#{parentDetailAddress},