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

2025-12-11 23:40:02 +08:00
parent 9104a00570
commit 6d2665e652
9 changed files with 89 additions and 26 deletions
--- a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java
+++ b/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);
+
    /**
     * 新增外宿申请审批记录
     *
--- a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java
+++ b/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);
 }
--- a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/DmsOutsideAccommodationApprovalServiceImpl.java
+++ b/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=失败）
+    }
 }
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml
+++ b/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>

    <!--根据学生姓名和学号查询申请表-->
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml
+++ b/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
--- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java
@@ -75,7 +75,7 @@ public class DmsOutsideAccommodationApplyController extends BaseController {
    /**
     * 获取外宿申请详细信息
     */
-    @PreAuthorize("@ss.hasPermi('dormitory:enlistmentReserve:query')")
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:query')")
    @GetMapping(value = "/process/{processInstanceId}")
    @ApiOperation("获取应征入伍保留学籍申请详细信息")
    public AjaxResult getInfoByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId) {
--- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java
@@ -2,6 +2,7 @@ package com.srs.web.controller.dormitory;

 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,11 +38,10 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    /**
     * 查询外宿申请审批记录列表
     */
-@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
-@GetMapping("/list")
-@ApiOperation("查询外宿申请审批记录列表")
-    public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
-    {
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询外宿申请审批记录列表")
+    public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
        startPage();
        List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
        return getDataTable(list);
@@ -54,8 +54,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    @Log(title = "外宿申请审批记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出外宿申请审批记录列表")
-    public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
-    {
+    public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
        List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
        ExcelUtil<DmsOutsideAccommodationApproval> util = new ExcelUtil<DmsOutsideAccommodationApproval>(DmsOutsideAccommodationApproval.class);
        util.exportExcel(response, list, "外宿申请审批记录数据");
@@ -67,8 +66,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:query')")
    @GetMapping(value = "/{id}")
    @ApiOperation("获取外宿申请审批记录详细信息")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalById(id));
    }

@@ -79,11 +77,21 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    @Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ApiOperation("新增外宿申请审批记录")
-    public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
-    {
+    public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
        return toAjax(dmsOutsideAccommodationApprovalService.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
    }

+    /**
+     * 新增或修改外宿申请审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:add')")
+    @Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
+    @PostMapping("/addOrUpdate")
+    @ApiOperation("新增或修改外宿申请审批记录")
+    public AjaxResult addOrUpdateAccommodationApproval(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
+        return toAjax(dmsOutsideAccommodationApprovalService.addOrUpdateAccommodationApproval(dmsOutsideAccommodationApproval));
+    }
+
    /**
     * 修改外宿申请审批记录
     */
@@ -91,8 +99,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    @Log(title = "外宿申请审批记录", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改外宿申请审批记录")
-    public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
-    {
+    public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
        return toAjax(dmsOutsideAccommodationApprovalService.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
    }

@@ -103,8 +110,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
    @Log(title = "外宿申请审批记录", businessType = BusinessType.DELETE)
    @PostMapping("/{ids}")
    @ApiOperation("删除外宿申请审批记录")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(dmsOutsideAccommodationApprovalService.deleteDmsOutsideAccommodationApprovalByIds(ids));
    }
 }
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java
@@ -3,16 +3,10 @@ package com.srs.flowable.listener.outsideAccommodation;

 import com.srs.common.utils.SecurityUtils;
 import com.srs.common.utils.spring.SpringUtils;
-import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
-import com.srs.flowable.domain.EnlistmentReserve;
-import com.srs.flowable.domain.EnlistmentReserveApproval;
 import com.srs.flowable.domain.OutsideAccommodationApply;
 import com.srs.flowable.domain.OutsideAccommodationApproval;
-import com.srs.flowable.mapper.EnlistmentReserveApprovalMapper;
-import com.srs.flowable.mapper.EnlistmentReserveMapper;
 import com.srs.flowable.mapper.OutsideAccommodationApplyMapper;
 import com.srs.flowable.mapper.OutsideAccommodationApprovalMapper;
-import com.srs.system.service.ISysUserService;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.FlowNode;
 import org.flowable.engine.RepositoryService;
@@ -132,8 +126,8 @@ public class OutsideAccommodationEndListener implements ExecutionListener {
        if (approval == null) {
            outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval);
        } else {
-            approval.setId(approval.getId());
-            outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval);
+            outsideAccommodationApproval.setId(approval.getId());
+            outsideAccommodationApprovalMapper.updateDmsOutsideAccommodationApproval(outsideAccommodationApproval);
        }
    }
 }
--- a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml
+++ b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.flowable.mapper.OutsideAccommodationApprovalMapper">
    
-    <resultMap type="DmsOutsideAccommodationApproval" id="DmsOutsideAccommodationApprovalResult">
+    <resultMap type="OutsideAccommodationApproval" id="DmsOutsideAccommodationApprovalResult">
        <result property="id"    column="id"    />
        <result property="applyId"    column="apply_id"    />
        <result property="applyNo"    column="apply_no"    />