外宿申请-审批生成审批记录

dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.srs.dormitory.domain.DmsOutsideAccommodationApproval;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 外宿申请审批记录Mapper接口
@@ -28,6 +29,14 @@ public interface DmsOutsideAccommodationApprovalMapper extends BaseMapper<DmsOut
      */
     List<DmsOutsideAccommodationApproval> selectDmsOutsideAccommodationApprovalList(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
 
+    /**
+     * 根据学生姓名学号和审批人id查询保留学籍审批记录
+     *
+     * @param
+     * @return 结果
+     */
+    DmsOutsideAccommodationApproval selectOutsideAccommodationApprovalByStuName(@Param("studentName") String studentName, @Param("studentNo") String studentNo, @Param("approverId") Long approverId);
+
     /**
      * 新增外宿申请审批记录
      *

dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java

@@ -59,4 +59,6 @@ public interface IDmsOutsideAccommodationApprovalService extends IService<DmsOut
      * @return 结果
      */
     int deleteDmsOutsideAccommodationApprovalById(Long id);
+
+    public int addOrUpdateAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval);
 }

dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApprovalServiceImpl.java

@@ -84,4 +84,40 @@ public class DmsOutsideAccommodationApprovalServiceImpl extends ServiceImpl<DmsO
     public int deleteDmsOutsideAccommodationApprovalById(Long id) {
         return dmsOutsideAccommodationApprovalMapper.deleteDmsOutsideAccommodationApprovalById(id);
     }
+
+    @Override
+    public int addOrUpdateAccommodationApproval(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
+        // 空值校验：避免空指针
+        if (dmsOutsideAccommodationApproval == null
+                || dmsOutsideAccommodationApproval.getStudentName() == null
+                || dmsOutsideAccommodationApproval.getStudentNo() == null
+                || dmsOutsideAccommodationApproval.getApproverId() == null) {
+            return 0;
+        }
+
+        int result = 0;
+        try {
+            // 1. 根据学生姓名、学号、审批人ID查询已有记录
+            DmsOutsideAccommodationApproval accommodationApproval = dmsOutsideAccommodationApprovalMapper
+                    .selectOutsideAccommodationApprovalByStuName(
+                            dmsOutsideAccommodationApproval.getStudentName(),
+                            dmsOutsideAccommodationApproval.getStudentNo(),
+                            dmsOutsideAccommodationApproval.getApproverId()
+                    );
+
+            // 2. 无记录则新增，有记录则更新
+            if (accommodationApproval == null) {
+                result = dmsOutsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval);
+            } else {
+                // 设置已有记录的ID，用于更新
+                dmsOutsideAccommodationApproval.setId(accommodationApproval.getId());
+                result = dmsOutsideAccommodationApprovalMapper.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval);
+            }
+        } catch (Exception e) {
+            log.error("新增/更新外宿审批记录失败", e);
+            // 抛出运行时异常，触发事务回滚
+            throw new RuntimeException("审批记录操作失败：" + e.getMessage());
+        }
+        return result; // 返回操作结果（1=成功，0=失败）
+    }
 }

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

@@ -247,7 +247,7 @@
     <select id="selectDmsOutsideAccommodationApplyByProcessInstanceId" parameterType="String"
             resultMap="DmsOutsideAccommodationApplyResult">
         <include refid="selectDmsOutsideAccommodationApplyVo"/>
-        where processInstanceId = #{process_instance_id}
+        where process_instance_id = #{processInstanceId}
     </select>
 
     <!--根据学生姓名和学号查询申请表-->

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

@@ -68,6 +68,22 @@
         where id = #{id}
     </select>
 
+    <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>
+            <if test="approverId != null and approverId != ''">
+                and approver_id = #{approverId}
+            </if>
+        </where>
+    </select>
+
     <insert id="insertDmsOutsideAccommodationApproval" parameterType="DmsOutsideAccommodationApproval"
             useGeneratedKeys="true" keyProperty="id">
         insert into dms_outside_accommodation_approval