From 76be171955b7709b613f480977cc3c2772a8ade5 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, 21 Nov 2025 17:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=BE=81=E5=85=A5=E4=BC=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E5=AD=A6=E7=B1=8D=E7=94=B3=E8=AF=B7=E8=A1=A8=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RtEnlistmentReserveAttachController.java       | 11 +++++++++++
 .../ApprovalAssigneeListener.java                  |  1 +
 .../mapper/RtEnlistmentReserveAttachMapper.java    | 11 +++++++++++
 .../routine/mapper/RtEnlistmentReserveMapper.java  |  9 +++++++++
 .../service/IRtEnlistmentReserveAttachService.java |  3 +++
 .../impl/RtEnlistmentReserveAttachServiceImpl.java |  5 +++++
 .../impl/RtEnlistmentReserveServiceImpl.java       |  6 ++++++
 .../routine/RtEnlistmentReserveAttachMapper.xml    |  6 ++++++
 .../mapper/routine/RtEnlistmentReserveMapper.xml   | 14 ++++++++++++++
 9 files changed, 66 insertions(+)

diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java
index 4e5a911..7ee1374 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java
@@ -127,4 +127,15 @@ public class RtEnlistmentReserveAttachController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(rtEnlistmentReserveAttachService.deleteRtEnlistmentReserveAttachByIds(ids));
     }
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:remove')")
+    @Log(title = "保留学籍申请附件（入伍通知书等）", businessType = BusinessType.DELETE)
+    @PostMapping("/deleteRtEnlistmentReserve")
+    @ApiOperation("删除保留学籍申请附件（入伍通知书等）")
+    public AjaxResult deleteRtEnlistmentReserveAttachByFileNameAndStuName(String fileName, String studentName) {
+        return toAjax(rtEnlistmentReserveAttachService.deleteRtEnlistmentReserveAttachByFileNameAndStuName(fileName, studentName));
+    }
 }
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
index 7ec0e79..bdee1a8 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
@@ -15,6 +15,7 @@ import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.FlowNode;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
+import org.flowable.engine.RuntimeService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 
diff --git a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java
index 1bdee46..b30b17f 100644
--- a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java
+++ b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.srs.routine.domain.RtEnlistmentReserveAttach;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 保留学籍申请附件（入伍通知书等）Mapper接口
@@ -20,6 +21,8 @@ public interface RtEnlistmentReserveAttachMapper extends BaseMapper<RtEnlistment
      */
     public RtEnlistmentReserveAttach selectRtEnlistmentReserveAttachById(Long id);
 
+
+
     /**
      * 查询保留学籍申请附件（入伍通知书等）列表
      *
@@ -58,6 +61,14 @@ public interface RtEnlistmentReserveAttachMapper extends BaseMapper<RtEnlistment
      */
     int deleteRtEnlistmentReserveAttachById(Long id);
 
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）
+     *
+     * @param fileName 文件名称
+     * @return 保留学籍申请附件（入伍通知书等）
+     */
+    int deleteRtEnlistmentReserveAttachByFileNameAndStuName(@Param("fileName") String fileName, @Param("studentName") String studentName);
+
     /**
      * 批量删除保留学籍申请附件（入伍通知书等）
      *
diff --git a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
index f5ef192..f4c1d85 100644
--- a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
+++ b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
@@ -6,6 +6,7 @@ import com.srs.common.doman.vo.TeacherVo;
 import com.srs.routine.domain.RtEnlistmentReserve;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 应征入伍保留学籍申请Mapper接口
@@ -30,6 +31,14 @@ public interface RtEnlistmentReserveMapper extends BaseMapper<RtEnlistmentReserv
      */
     public RtEnlistmentReserve selectRtEnlistmentReserveByProcessInstanceId(String processInstanceId);
 
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param studentName 学生姓名
+     * @return 应征入伍保留学籍申请
+     */
+    public RtEnlistmentReserve getEnlistmentReserveByStuNameAndStuNo(@Param("studentName") String studentName, @Param("studentName") String studentNo);
+
     //    <!--  根据学号查询辅导员信息  -->
     public TeacherVo getCounselorInfo(String stuNo);
 
diff --git a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java
index 2a82054..5395144 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.srs.routine.domain.RtEnlistmentReserveAttach;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 保留学籍申请附件（入伍通知书等）Service接口
@@ -65,4 +66,6 @@ public interface IRtEnlistmentReserveAttachService extends IService<RtEnlistment
      * @return 结果
      */
     int deleteRtEnlistmentReserveAttachById(Long id);
+
+    int deleteRtEnlistmentReserveAttachByFileNameAndStuName(@Param("fileName") String fileName, @Param("studentName") String studentName);
 }
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveAttachServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveAttachServiceImpl.java
index 1ea2e52..e11aa64 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveAttachServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveAttachServiceImpl.java
@@ -125,4 +125,9 @@ public class RtEnlistmentReserveAttachServiceImpl extends ServiceImpl<RtEnlistme
     public int deleteRtEnlistmentReserveAttachById(Long id) {
         return rtEnlistmentReserveAttachMapper.deleteRtEnlistmentReserveAttachById(id);
     }
+
+    @Override
+    public int deleteRtEnlistmentReserveAttachByFileNameAndStuName(String fileName, String studentName) {
+        return rtEnlistmentReserveAttachMapper.deleteRtEnlistmentReserveAttachByFileNameAndStuName(fileName, studentName);
+    }
 }
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 5a2844d..046925c 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
@@ -82,6 +82,12 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
      */
     @Override
     public RtEnlistmentReserve insertRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve) {
+        // 新增之前先查询申请记录是否存在，如果存在就不能新增重复的数据
+        RtEnlistmentReserve enlistmentReserveByStuNameAndStuNo = rtEnlistmentReserveMapper.getEnlistmentReserveByStuNameAndStuNo(rtEnlistmentReserve.getStudentName(), rtEnlistmentReserve.getStudentNo());
+        if (enlistmentReserveByStuNameAndStuNo != null) {
+            throw new ServiceException("您已经申请过了，请勿重新申请！", 400);
+        }
+
         rtEnlistmentReserve.setCreateTime(DateUtils.getNowDate());
 
         // 先插入申请表数据，获取自增 ID（数据库自动为 applyStatus 赋值 0 若未传值）
diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
index e104793..bb2f7ad 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
@@ -160,6 +160,12 @@
         where id = #{id}
     </delete>
 
+    <delete id="deleteRtEnlistmentReserveAttachByFileNameAndStuName" parameterType="String">
+        delete
+        from rt_enlistment_reserve_attach
+        where file_name = #{fileName} and student_name = #{studentName}
+    </delete>
+
     <delete id="deleteRtEnlistmentReserveAttachByIds" parameterType="String">
         delete from rt_enlistment_reserve_attach where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
index 907912f..5d0ed9b 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
@@ -167,6 +167,20 @@
         where id = #{id}
     </select>
 
+    <!--根据学生姓名和学号查询申请表-->
+    <select id="getEnlistmentReserveByStuNameAndStuNo" resultMap="RtEnlistmentReserveResult">
+        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="selectRtEnlistmentReserveByProcessInstanceId" parameterType="String"
             resultMap="RtEnlistmentReserveResult">