From 6d2665e652af332a201c83860b3adaa5af936fcc Mon Sep 17 00:00:00 2001 From: "962704835@qq.com" Date: Thu, 11 Dec 2025 23:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7-=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E7=94=9F=E6=88=90=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DmsOutsideAccommodationApprovalMapper.java | 9 +++++ ...msOutsideAccommodationApprovalService.java | 2 ++ ...tsideAccommodationApprovalServiceImpl.java | 36 +++++++++++++++++++ .../DmsOutsideAccommodationApplyMapper.xml | 2 +- .../DmsOutsideAccommodationApprovalMapper.xml | 16 +++++++++ ...msOutsideAccommodationApplyController.java | 2 +- ...utsideAccommodationApprovalController.java | 36 +++++++++++-------- .../OutsideAccommodationEndListener.java | 10 ++---- .../OutsideAccommodationApprovalMapper.xml | 2 +- 9 files changed, 89 insertions(+), 26 deletions(-) diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java b/dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsOutsideAccommodationApprovalMapper.java index fc2aa53..052491c 100644 --- 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 selectDmsOutsideAccommodationApprovalList(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval); + /** + * 根据学生姓名学号和审批人id查询保留学籍审批记录 + * + * @param + * @return 结果 + */ + DmsOutsideAccommodationApproval selectOutsideAccommodationApprovalByStuName(@Param("studentName") String studentName, @Param("studentNo") String studentNo, @Param("approverId") Long approverId); + /** * 新增外宿申请审批记录 * diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/IDmsOutsideAccommodationApprovalService.java index b83df17..784efe3 100644 --- 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 - where processInstanceId = #{process_instance_id} + where process_instance_id = #{processInstanceId} diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml index 7149f3d..e3c6fa4 100644 --- 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} + + insert into dms_outside_accommodation_approval diff --git 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 index 2aa8c7f..4541f2e 100644 --- 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) { diff --git 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 index 63c9d99..c5cf916 100644 --- 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 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 list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval); ExcelUtil util = new ExcelUtil(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)); } } diff --git 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 index 2c5a54d..562a278 100644 --- 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); } } } \ No newline at end of file diff --git a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml index cc4d0d9..a2be377 100644 --- 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"> - +