From 86df798c25483a35b5f45e9247a555e1f7fe3785 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, 12 Dec 2025 17:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DmsOutsideAccommodationAttachment.java    |   8 +-
 ...sOutsideAccommodationAttachmentMapper.java |  10 ++
 ...OutsideAccommodationAttachmentService.java |   3 +
 ...ideAccommodationAttachmentServiceImpl.java |   5 +
 ...msOutsideAccommodationAttachmentMapper.xml | 111 ++++++++++++++++++
 ...sideAccommodationAttachmentController.java |  11 ++
 6 files changed, 147 insertions(+), 1 deletion(-)

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
index aa395a9..6064e49 100644
--- a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationAttachment.java
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationAttachment.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
+import java.util.List;
 
 
 /**
@@ -104,5 +105,10 @@ private static final long serialVersionUID=1L;
     @Excel(name = "学生学号")
     private String studentNo;
 
-
+    /**
+     * 外宿申请表
+     */
+    @ApiModelProperty(value = "外宿申请表", hidden = true)
+    @Excel(name = "外宿申请表")
+    private List<DmsOutsideAccommodationApply> outsideAccommodationApplies;
 }
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
index fb08282..43805b6 100644
--- a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationAttachmentMapper.java
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationAttachmentMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 外宿申请附件Mapper接口
@@ -59,6 +60,15 @@ public interface DmsOutsideAccommodationAttachmentMapper extends BaseMapper<DmsO
      */
     int deleteDmsOutsideAccommodationAttachmentById(Long id);
 
+    /**
+     * 删除外宿申请附件
+     *
+     * @param attachmentName 文件名称
+     * @return 外宿申请附件
+     */
+    int deleteOutsideAccommodationAttachmentNameAndStuName(@Param("attachmentName") String attachmentName, @Param("studentName") String studentName);
+
+
     /**
      * 批量删除外宿申请附件
      *
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
index d7aeaeb..b6b00e2 100644
--- a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationAttachmentService.java
+++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationAttachmentService.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.srs.dormitory.domain.DmsOutsideAccommodationAttachment;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 外宿申请附件Service接口
@@ -59,6 +60,8 @@ public interface IDmsOutsideAccommodationAttachmentService extends IService<DmsO
      */
     int deleteDmsOutsideAccommodationAttachmentByIds(Long[] ids);
 
+    int deleteOutsideAccommodationAttachmentNameAndStuName(@Param("attachmentName") String attachmentName, @Param("studentName") String studentName);
+
     /**
      * 删除外宿申请附件信息
      *
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
index 688ec77..c28f3cd 100644
--- 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
@@ -88,6 +88,11 @@ public class DmsOutsideAccommodationAttachmentServiceImpl extends ServiceImpl<Dm
         return dmsOutsideAccommodationAttachmentMapper.deleteDmsOutsideAccommodationAttachmentByIds(ids);
     }
 
+    @Override
+    public int deleteOutsideAccommodationAttachmentNameAndStuName(String attachmentName, String studentName) {
+        return dmsOutsideAccommodationAttachmentMapper.deleteOutsideAccommodationAttachmentNameAndStuName(attachmentName, studentName);
+    }
+
     /**
      * 删除外宿申请附件信息
      *
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml
index 7f01f99..f739087 100644
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml
@@ -16,8 +16,113 @@
         <result property="processInstanceId" column="process_instance_id"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
+        <!--外宿申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
+        <collection property="outsideAccommodationApplies"
+                    column="{studentName = student_name, studentNo = student_no, id = apply_id}"
+                    javaType="java.util.ArrayList" select="selectOutsideAccommodationApplyByStuName"/>
     </resultMap>
 
+    <!--外宿申请表-->
+    <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"    />
+        <!--外宿申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
+        <collection property="outsideAccommodationApprovals"
+                    column="{studentName = student_name, studentNo = student_no}"
+                    javaType="java.util.ArrayList" select="selectOutsideAccommodationApprovalByStuName"/>
+    </resultMap>
+
+    <!--  外宿申请表 -->
+    <select id="selectOutsideAccommodationApplyByStuName" resultMap="DmsOutsideAccommodationApplyResult">
+        select *
+        from dms_outside_accommodation_apply
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="studentName != null and studentName != ''">
+                and student_name = #{studentName}
+            </if>
+            <if test="studentNo != null and studentNo != ''">
+                and student_no = #{studentNo}
+            </if>
+        </where>
+    </select>
+
+    <!--外宿申请表-审核记录-->
+    <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>
+
+    <!--  外宿申请表-审核记录子表，根据学生姓名、学号查询  -->
+    <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>
+        </where>
+    </select>
+
     <sql id="selectDmsOutsideAccommodationAttachmentVo">
         select id,
                apply_id,
@@ -145,6 +250,12 @@
         where id = #{id}
     </delete>
 
+    <delete id="deleteOutsideAccommodationAttachmentNameAndStuName" parameterType="String">
+        delete
+        from dms_outside_accommodation_attachment
+        where attachment_name = #{attachmentName} and student_name = #{studentName}
+    </delete>
+
     <delete id="deleteDmsOutsideAccommodationAttachmentByIds" parameterType="String">
         delete from dms_outside_accommodation_attachment where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
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
index 1541784..b3a1eda 100644
--- 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
@@ -124,4 +124,15 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(dmsOutsideAccommodationAttachmentService.deleteDmsOutsideAccommodationAttachmentByIds(ids));
     }
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:remove')")
+    @Log(title = "外宿申请附件", businessType = BusinessType.DELETE)
+    @PostMapping("/OutsideAccommodationAttachment")
+    @ApiOperation("删除外宿申请附件")
+    public AjaxResult deleteOutsideAccommodationAttachmentNameAndStuName(String attachmentName, String studentName) {
+        return toAjax(dmsOutsideAccommodationAttachmentService.deleteOutsideAccommodationAttachmentNameAndStuName(attachmentName, studentName));
+    }
 }