From 20293d24354955d968b21082dfb3413483adcde6 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 16 Sep 2025 17:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/TransferApplyController.java | 28 +++++++++ .../bonus/web/domain/TransferApplyDto.java | 1 + .../web/domain/vo/DaKyProFilesContentsVo.java | 1 - .../bonus/web/mapper/TransferApplyMapper.java | 8 +++ .../web/service/TransferApplyService.java | 5 ++ .../impl/TransferApplyServiceImpl.java | 18 ++++++ .../resources/mapper/TransferApplyMapper.xml | 59 +++++++++++++++++++ 7 files changed, 119 insertions(+), 1 deletion(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java index 52e4112..9c5bdb3 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java @@ -6,6 +6,7 @@ import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.enums.OperaType; +import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.service.TransferApplyService; import io.swagger.annotations.ApiOperation; @@ -43,6 +44,19 @@ public class TransferApplyController extends BaseController { } } + @ApiOperation(value = "获取部门下拉") + @GetMapping("getDeptSelect") + @SysLog(title = "获取部门下拉", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "获取部门下拉", logType = 1) + public AjaxResult getDeptSelect(TransferApplyDto dto) { + try { + List list = transferApplyService.getDeptSelect(dto); + return AjaxResult.success(list); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } + @ApiOperation(value = "新增档案移交申请") @PostMapping("saveTransferApply") @SysLog(title = "新增档案移交申请", module = "数据/档案移交->档案移交申请", businessType = OperaType.INSERT, details = "新增档案移交申请", logType = 1) @@ -82,6 +96,7 @@ public class TransferApplyController extends BaseController { return AjaxResult.error("请求出错了"); } } + @ApiOperation(value = "删除档案移交申请") @PostMapping("delTransferApply") @SysLog(title = "删除档案移交申请", module = "数据/档案移交->档案移交申请", businessType = OperaType.DELETE, details = "删除档案移交申请", logType = 1) @@ -94,4 +109,17 @@ public class TransferApplyController extends BaseController { return AjaxResult.error("请求出错了"); } } + + @ApiOperation(value = "档案移交审核") + @PostMapping("auditTransferApply") + @SysLog(title = "档案移交审核", module = "数据/档案移交->档案移交申请", businessType = OperaType.UPDATE, details = "档案移交审核", logType = 1) + @RequiresPermissions("transfer:apply:audit") + public AjaxResult auditTransferApply(@RequestBody TransferApplyDto dto) { + try { + return transferApplyService.audit(dto); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } } diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java index 6510c2e..8903d47 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java @@ -48,6 +48,7 @@ public class TransferApplyDto { * 审核人 */ private String auditUser; + private String auditUserName; /** * 申请时间 diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java b/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java index 63e5a17..f348b71 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java @@ -45,7 +45,6 @@ public class DaKyProFilesContentsVo { /** * 分类号/案卷排序号 */ - @NotNull(message = "分类号/案卷排序号不能为空") private Integer sort; /** diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java index 983dc74..0da13cb 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java @@ -1,5 +1,7 @@ package com.bonus.web.mapper; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.domain.TransferFileDto; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +28,10 @@ public interface TransferApplyMapper { Integer delTransferFiles(TransferApplyDto dto); Integer del(TransferApplyDto dto); + + Integer audit(TransferApplyDto dto); + + Integer addTransferAuditRecord(TransferApplyDto dto); + + List getDeptSelect(TransferApplyDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java index 60d8378..7943bab 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java @@ -1,6 +1,7 @@ package com.bonus.web.service; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import java.util.List; @@ -19,4 +20,8 @@ public interface TransferApplyService { AjaxResult edit(TransferApplyDto dto); AjaxResult del(TransferApplyDto dto); + + AjaxResult audit(TransferApplyDto dto); + + List getDeptSelect(TransferApplyDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java index e2017c0..8f75fb6 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.web.service.impl; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.domain.TransferFileDto; import com.bonus.web.mapper.TransferApplyMapper; @@ -83,4 +84,21 @@ public class TransferApplyServiceImpl implements TransferApplyService { return AjaxResult.error("档案删除失败"); } } + + @Override + public AjaxResult audit(TransferApplyDto dto) { + Integer i = transferApplyMapper.audit(dto); + if (i > 0) { + dto.setAuditUser(getLoginUser().getUserId().toString()); + dto.setAuditUserName(getLoginUser().getUsername()); + transferApplyMapper.addTransferAuditRecord(dto); + AjaxResult.success("审核成功"); + } + return AjaxResult.error("审核失败"); + } + + @Override + public List getDeptSelect(TransferApplyDto dto) { + return transferApplyMapper.getDeptSelect(dto); + } } diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 0c579c4..865a895 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -173,6 +173,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + INSERT INTO da_ky_transfer_audit_record + + + transfer_apply_id, + + + audit_status, + + + audit_option, + + + audit_user_id, + + + audit_user_name, + + + + + #{id}, + + + #{auditStatus}, + + + #{auditOpinion}, + + + #{auditUser}, + + + #{auditUserName}, + + + UPDATE da_ky_transfer_apply @@ -221,6 +258,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} + + UPDATE da_ky_transfer_apply + + + audit_status = #{auditStatus}, + + + audit_opinion = #{auditOpinion}, + + + WHERE id = #{id} + DELETE FROM da_ky_transfer_file WHERE transfer_apply_id = #{id} @@ -283,5 +332,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join da_ky_project dkp on dkp.id = dktf.pro_id where dktf.transfer_apply_id = #{id} +