外宿申请表单修改

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;
+
     /**
      * 家长通讯地址-省市区/县
      */

dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml

@@ -19,9 +19,11 @@
         <result property="classId" column="class_id"/>
         <result property="className" column="class_name"/>
         <result property="originalDormitory" column="original_dormitory"/>
+        <result property="keepOriginalBed" column="keep_original_bed"/>
         <result property="accommodationFee" column="accommodation_fee"/>
         <result property="accommodationFeeStatus" column="accommodation_fee_status"/>
         <result property="applyReason" column="apply_reason"/>
+        <result property="outsideCondition" column="outside_condition"/>
         <result property="outsideAddress" column="outside_address"/>
         <result property="address" column="address"/>
         <result property="emergencyPhone" column="emergency_phone"/>
@@ -29,6 +31,8 @@
         <result property="parentOpinion" column="parent_opinion"/>
         <result property="parentSignAttachment" column="parent_sign_attachment"/>
         <result property="parentPhone" column="parent_phone"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="parentRelation" column="parent_relation"/>
         <result property="parentAddress" column="parent_address"/>
         <result property="parentDetailAddress" column="parent_detail_address"/>
         <result property="studentPromiseSign" column="student_promise_sign"/>
@@ -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 @@
             <if test="originalDormitory != null  and originalDormitory != ''">and original_dormitory =
                 #{originalDormitory}
             </if>
+            <if test="keepOriginalBed != null ">and keep_original_bed = #{keepOriginalBed}</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="outsideCondition != null ">and outside_condition = #{outsideCondition}</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>
@@ -209,6 +219,9 @@
                 #{parentSignAttachment}
             </if>
             <if test="parentPhone != null  and parentPhone != ''">and parent_phone = #{parentPhone}</if>
+            <if test="parentName != null  and parentName != ''">and parent_name like concat('%', #{parentName}, '%')
+            </if>
+            <if test="parentRelation != null  and parentRelation != ''">and parent_relation = #{parentRelation}</if>
             <if test="parentAddress != null  and parentAddress != ''">and parent_address = #{parentAddress}</if>
             <if test="parentDetailAddress != null  and parentDetailAddress != ''">and parent_detail_address =
                 #{parentDetailAddress}
@@ -235,6 +248,7 @@
             <if test="studentSignature != null  and studentSignature != ''">and student_signature =
                 #{studentSignature}
             </if>
+            <if test="promiseContent != null  and promiseContent != ''">and promise_content = #{promiseContent}</if>
         </where>
     </select>
 
@@ -293,9 +307,11 @@
             <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="keepOriginalBed != null">keep_original_bed,</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="outsideCondition != null">outside_condition,</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>
@@ -303,6 +319,8 @@
             <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="parentName != null and parentName != ''">parent_name,</if>
+            <if test="parentRelation != null and parentRelation != ''">parent_relation,</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>
@@ -339,9 +357,11 @@
             <if test="classId != null">#{classId},</if>
             <if test="className != null and className != ''">#{className},</if>
             <if test="originalDormitory != null and originalDormitory != ''">#{originalDormitory},</if>
+            <if test="keepOriginalBed != null">#{keepOriginalBed},</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="outsideCondition != null">#{outsideCondition},</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>
@@ -349,6 +369,8 @@
             <if test="parentOpinion != null">#{parentOpinion},</if>
             <if test="parentSignAttachment != null and parentSignAttachment != ''">#{parentSignAttachment},</if>
             <if test="parentPhone != null and parentPhone != ''">#{parentPhone},</if>
+            <if test="parentName != null and parentName != ''">#{parentName},</if>
+            <if test="parentRelation != null and parentRelation != ''">#{parentRelation},</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>
@@ -391,9 +413,11 @@
             <if test="originalDormitory != null and originalDormitory != ''">original_dormitory =
                 #{originalDormitory},
             </if>
+            <if test="keepOriginalBed != null">keep_original_bed = #{keepOriginalBed},</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="outsideCondition != null">outside_condition = #{outsideCondition},</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>
@@ -403,6 +427,8 @@
                 #{parentSignAttachment},
             </if>
             <if test="parentPhone != null and parentPhone != ''">parent_phone = #{parentPhone},</if>
+            <if test="parentName != null and parentName != ''">parent_name = #{parentName},</if>
+            <if test="parentRelation != null and parentRelation != ''">parent_relation = #{parentRelation},</if>
             <if test="parentAddress != null and parentAddress != ''">parent_address = #{parentAddress},</if>
             <if test="parentDetailAddress != null and parentDetailAddress != ''">parent_detail_address =
                 #{parentDetailAddress},