From 9104a00570f69e1172f6ba90b7d5886c3029ef8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com> Date: Thu, 11 Dec 2025 17:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=8D=E4=BF=9D=E7=95=99=E5=AD=A6?= =?UTF-8?q?=E7=B1=8D-=E7=94=B3=E8=AF=B7=E8=A1=A8=E8=AF=A6=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/DmsOutsideAccommodationApply.java | 13 ++ ...sOutsideAccommodationAttachmentMapper.java | 7 + ...OutsideAccommodationAttachmentService.java | 7 + ...ideAccommodationAttachmentServiceImpl.java | 11 ++ .../DmsOutsideAccommodationApplyMapper.xml | 70 ++++++++++ .../DmsOutsideAccommodationApprovalMapper.xml | 102 +++++++++------ ...msOutsideAccommodationAttachmentMapper.xml | 122 +++++++++++++----- ...sideAccommodationAttachmentController.java | 47 ++++--- 8 files changed, 291 insertions(+), 88 deletions(-) diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java index 2c5a4fe..14553d7 100644 --- a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java +++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApply.java @@ -1,6 +1,7 @@ package com.srs.dormitory.domain; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.srs.common.annotation.Excel; @@ -357,5 +358,17 @@ public class DmsOutsideAccommodationApply extends BaseEntity { @Excel(name = "承诺内容") private String promiseContent; + /** + * 外宿申请表-附件记录 + */ + @ApiModelProperty(value = "外宿申请表-附件记录", hidden = true) + @Excel(name = "外宿申请表-附件记录") + private List outsideAccommodationAttachments; + /** + * 外宿申请表-审核记录 + */ + @ApiModelProperty(value = "外宿申请表-审核记录", hidden = true) + @Excel(name = "外宿申请表-审核记录") + private List outsideAccommodationApprovals; } 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 e157e6d..fb08282 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 @@ -28,6 +28,13 @@ public interface DmsOutsideAccommodationAttachmentMapper extends BaseMapper selectDmsOutsideAccommodationAttachmentList(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment); + /** + * 批量插入校外住宿附件 + * @param list 校外住宿附件列表 + * @return 插入行数 + */ + int batchInsertDmsOutsideAccommodationAttachment(List list); + /** * 新增外宿申请附件 * 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 abfe070..d7aeaeb 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 @@ -28,6 +28,13 @@ public interface IDmsOutsideAccommodationAttachmentService extends IService selectDmsOutsideAccommodationAttachmentList(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment); + /** + * 批量插入校外住宿附件 + * @param list 校外住宿附件列表 + * @return 插入行数 + */ + int batchInsertDmsOutsideAccommodationAttachment(List list); + /** * 新增外宿申请附件 * 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 42f6aaa..688ec77 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 @@ -43,6 +43,17 @@ public class DmsOutsideAccommodationAttachmentServiceImpl extends ServiceImpl list) { + // 统一设置默认值（如创建时间） + for (DmsOutsideAccommodationAttachment attach : list) { + attach.setCreateTime(DateUtils.getNowDate()); // 批量设置创建时间 + // 其他默认值（如状态等） + } + // 调用Mapper层批量插入方法 + return dmsOutsideAccommodationAttachmentMapper.batchInsertDmsOutsideAccommodationAttachment(list); + } + /** * 新增外宿申请附件 * diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml index f64f9ad..6b46bf4 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml @@ -50,7 +50,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml index d13d8b2..7149f3d 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml @@ -1,53 +1,75 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - + + + + + + + + + + + + + - select id, apply_id, apply_no, approval_node, approver_id, approver_name, approver_role, approval_opinion, approval_result, approval_time, process_instance_id, student_name, student_no from dms_outside_accommodation_approval + select id, + apply_id, + apply_no, + approval_node, + approver_id, + approver_name, + approver_role, + approval_opinion, + approval_result, + approval_time, + process_instance_id, + student_name, + student_no + from dms_outside_accommodation_approval - - - and apply_id = #{applyId} - and apply_no = #{applyNo} - and approval_node = #{approvalNode} - and approver_id = #{approverId} - and approver_name like concat('%', #{approverName}, '%') - and approver_role = #{approverRole} - and approval_opinion = #{approvalOpinion} - and approval_result = #{approvalResult} - and approval_time = #{approvalTime} - and process_instance_id = #{processInstanceId} - and student_name like concat('%', #{studentName}, '%') - and student_no = #{studentNo} + + and apply_id = #{applyId} + and apply_no = #{applyNo} + and approval_node = #{approvalNode} + and approver_id = #{approverId} + and approver_name like concat('%', #{approverName}, + '%') + + and approver_role = #{approverRole} + and approval_opinion = #{approvalOpinion} + and approval_result = #{approvalResult} + and approval_time = #{approvalTime} + and process_instance_id = + #{processInstanceId} + + and student_name like concat('%', #{studentName}, + '%') + + and student_no = #{studentNo} - - where id = #{id} - - + + insert into dms_outside_accommodation_approval apply_id, @@ -62,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_instance_id, student_name, student_no, - + #{applyId}, #{applyNo}, @@ -76,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{processInstanceId}, #{studentName}, #{studentNo}, - + @@ -99,11 +121,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_outside_accommodation_approval where id = #{id} + delete + from dms_outside_accommodation_approval + where id = #{id} - delete from dms_outside_accommodation_approval where id in + delete from dms_outside_accommodation_approval where id in #{id} diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml index bd3dbb6..7f01f99 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationAttachmentMapper.xml @@ -1,48 +1,100 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - + + + + + + + + + + + - select id, apply_id, attachment_name, attachment_url, attachment_type, file_size, file_suffix, create_time, process_instance_id, student_name, student_no from dms_outside_accommodation_attachment + select id, + apply_id, + attachment_name, + attachment_url, + attachment_type, + file_size, + file_suffix, + create_time, + process_instance_id, + student_name, + student_no + from dms_outside_accommodation_attachment - - - and apply_id = #{applyId} - and attachment_name like concat('%', #{attachmentName}, '%') - and attachment_url = #{attachmentUrl} - and attachment_type = #{attachmentType} - and file_size = #{fileSize} - and file_suffix = #{fileSuffix} - and process_instance_id = #{processInstanceId} - and student_name like concat('%', #{studentName}, '%') - and student_no = #{studentNo} + + and apply_id = #{applyId} + and attachment_name like concat('%', + #{attachmentName}, '%') + + and attachment_url = #{attachmentUrl} + and attachment_type = #{attachmentType} + and file_size = #{fileSize} + and file_suffix = #{fileSuffix} + and process_instance_id = + #{processInstanceId} + + and student_name like concat('%', #{studentName}, + '%') + + and student_no = #{studentNo} - - where id = #{id} - - + + + + insert into dms_outside_accommodation_attachment + ( + apply_id, + attachment_name, + attachment_url, + attachment_type, + file_size, + file_suffix, + create_time, + process_instance_id, + student_name, + student_no + ) + values + + ( + #{item.applyId}, + #{item.attachmentName}, + #{item.attachmentUrl}, + #{item.attachmentType}, + #{item.fileSize}, + #{item.fileSuffix}, + #{item.createTime}, + #{item.processInstanceId}, + #{item.studentName}, + #{item.studentNo} + ) + + + + insert into dms_outside_accommodation_attachment apply_id, @@ -55,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_instance_id, student_name, student_no, - + #{applyId}, #{attachmentName}, @@ -67,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{processInstanceId}, #{studentName}, #{studentNo}, - + @@ -88,11 +140,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_outside_accommodation_attachment where id = #{id} + delete + from dms_outside_accommodation_attachment + where id = #{id} - delete from dms_outside_accommodation_attachment where id in + delete from dms_outside_accommodation_attachment where id in #{id} 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 24ea031..1541784 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 @@ -2,6 +2,8 @@ package com.srs.web.controller.dormitory; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.srs.routine.domain.RtEnlistmentReserveAttach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -37,11 +39,10 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController /** * 查询外宿申请附件列表 */ -@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')") -@GetMapping("/list") -@ApiOperation("查询外宿申请附件列表") - public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) - { + @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')") + @GetMapping("/list") + @ApiOperation("查询外宿申请附件列表") + public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) { startPage(); List list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment); return getDataTable(list); @@ -54,8 +55,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController @Log(title = "外宿申请附件", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("导出外宿申请附件列表") - public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) - { + public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) { List list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment); ExcelUtil util = new ExcelUtil(DmsOutsideAccommodationAttachment.class); util.exportExcel(response, list, "外宿申请附件数据"); @@ -67,8 +67,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:query')") @GetMapping(value = "/{id}") @ApiOperation("获取外宿申请附件详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentById(id)); } @@ -79,11 +78,31 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController @Log(title = "外宿申请附件", businessType = BusinessType.INSERT) @PostMapping("/add") @ApiOperation("新增外宿申请附件") - public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) - { + public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) { return toAjax(dmsOutsideAccommodationAttachmentService.insertDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment)); } + /** + * 批量新增保留学籍申请附件（入伍通知书等） + */ + @PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:add')") + @Log(title = "外宿申请附件", businessType = BusinessType.INSERT) + @PostMapping("/batchAdd") // 注意：修改接口路径避免与原单条接口冲突 + @ApiOperation("批量新增外宿申请附件") + public AjaxResult batchAdd(@RequestBody List list) { + // 1. 校验参数合法性 + if (list == null || list.isEmpty()) { + return AjaxResult.error("批量插入失败：附件列表不能为空"); + } + + // 2. 调用Service层批量插入方法 + int rows = dmsOutsideAccommodationAttachmentService.batchInsertDmsOutsideAccommodationAttachment(list); + + // 3. 返回结果（rows为成功插入的条数） + return rows > 0 ? AjaxResult.success("批量插入成功，共插入 " + rows + " 条记录") + : AjaxResult.error("批量插入失败"); + } + /** * 修改外宿申请附件 */ @@ -91,8 +110,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController @Log(title = "外宿申请附件", businessType = BusinessType.UPDATE) @PostMapping("/update") @ApiOperation("修改外宿申请附件") - public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) - { + public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) { return toAjax(dmsOutsideAccommodationAttachmentService.updateDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment)); } @@ -103,8 +121,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController @Log(title = "外宿申请附件", businessType = BusinessType.DELETE) @PostMapping("/{ids}") @ApiOperation("删除外宿申请附件") - public AjaxResult remove(@PathVariable Long[] ids) - { + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(dmsOutsideAccommodationAttachmentService.deleteDmsOutsideAccommodationAttachmentByIds(ids)); } }