From 7f4772f5b8dd544a1135d94ce82fa54058a45bc7 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 19 Sep 2025 11:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/FileTransferRecordController.java | 49 +++++-- .../archive/TransferApplyController.java | 15 ++ .../bonus/web/domain/TransferApplyDto.java | 7 + .../bonus/web/mapper/TransferApplyMapper.java | 5 + .../web/service/TransferApplyService.java | 3 + .../impl/TransferApplyServiceImpl.java | 20 ++- .../resources/mapper/TransferApplyMapper.xml | 132 +++++++++++++++--- 7 files changed, 190 insertions(+), 41 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java index ee5e1b5..e92878d 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java @@ -3,11 +3,14 @@ package com.bonus.web.controller.archive; import com.bonus.common.annotation.RequiresPermissions; import com.bonus.common.annotation.SysLog; 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.TransferApplyDto; +import com.bonus.web.service.TransferApplyService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,19 +27,37 @@ import java.util.List; @RequestMapping("/transferRecord") @Slf4j public class FileTransferRecordController extends BaseController { -// @ApiOperation(value = "档案移交申请列表") -// @GetMapping("getTransferRecordList") -// @SysLog(title = "档案移交申请列表", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请列表", logType = 1) -// @RequiresPermissions("transfer:record:list") -// public TableDataInfo getTransferRecordList(TransferApplyDto dto) { -// try { -// startPage(); -// List list = transferApplyService.list(dto); -// return getDataTable(list); -// } catch (Exception e) { -// log.error(e.toString(), e); -// return getDataTable(new ArrayList<>()); -// } -// } + + @Autowired + private TransferApplyService transferApplyService; + @ApiOperation(value = "档案移交申请列表") + @GetMapping("getTransferRecordList") + @SysLog(title = "档案移交申请列表", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请列表", logType = 1) + @RequiresPermissions("transfer:record:list") + public TableDataInfo getTransferRecordList(TransferApplyDto dto) { + try { + startPage(); + dto.setAuditStatus("1"); + List list = transferApplyService.list(dto); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + return getDataTable(new ArrayList<>()); + } + } + + @ApiOperation(value = "档案移交申请详情") + @GetMapping("getTransferRecordDetail") + @SysLog(title = "档案移交申请详情", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请详情", logType = 1) + @RequiresPermissions("transfer:record:query") + public AjaxResult getTransferApply(TransferApplyDto dto) { + try { + TransferApplyDto transferApply = transferApplyService.getTransferApply(dto); + return AjaxResult.success(transferApply); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } } 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 4e520da..a81bee7 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 @@ -7,6 +7,7 @@ import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.entity.SysDept; import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.enums.OperaType; +import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.service.TransferApplyService; @@ -135,4 +136,18 @@ public class TransferApplyController extends BaseController { return AjaxResult.error("请求出错了"); } } + + @ApiOperation(value = "档案移交申请列表") + @GetMapping("getTransferApplyFiles") + @SysLog(title = "档案移交申请列表", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请列表", logType = 1) + @RequiresPermissions("transfer:apply:list") + public AjaxResult getTransferApplyFiles(TransferApplyDto dto) { + try { + List list = transferApplyService.getTransferApplyFiles(dto); + return AjaxResult.success(list); + } 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 8903d47..0824989 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 @@ -14,6 +14,7 @@ public class TransferApplyDto { * 主键ID */ private Integer id; + private String parentId; /** * 项目ID @@ -109,6 +110,12 @@ public class TransferApplyDto { */ private Integer updateUserId; + //工程类型 + private String proType; + + //电压等级 + private String voltageLevel; + /** * 是否删除：0.删除 1.未删除 */ 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 b06a262..bdd6a6c 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 @@ -2,6 +2,7 @@ package com.bonus.web.mapper; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.entity.SysDept; +import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.domain.TransferFileDto; @@ -37,4 +38,8 @@ public interface TransferApplyMapper { List getDeptSelect(TransferApplyDto dto); List getProSelect(TransferApplyDto dto); + + List getTransferApplyFilesContents(TransferApplyDto dto); + + List getTransferApplyFiles(String content); } 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 fed3c86..33282d8 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 @@ -2,6 +2,7 @@ package com.bonus.web.service; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.entity.SysDept; +import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; @@ -27,4 +28,6 @@ public interface TransferApplyService { List getDeptSelect(TransferApplyDto dto); List getProSelect(TransferApplyDto dto); + + List getTransferApplyFiles(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 ed6d08d..5abfd2a 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 @@ -3,15 +3,14 @@ package com.bonus.web.service.impl; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.entity.SysDept; import com.bonus.web.controller.tool.TreeBuilder; -import com.bonus.web.domain.ArchivalCatalogueDto; -import com.bonus.web.domain.SelectDto; -import com.bonus.web.domain.TransferApplyDto; -import com.bonus.web.domain.TransferFileDto; +import com.bonus.web.domain.*; import com.bonus.web.mapper.TransferApplyMapper; import com.bonus.web.service.TransferApplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import static com.bonus.common.utils.SecurityUtils.getLoginUser; @@ -31,6 +30,7 @@ public class TransferApplyServiceImpl implements TransferApplyService { } @Override + @Transactional public AjaxResult save(TransferApplyDto dto) { try { dto.setAuditStatus("0"); @@ -112,4 +112,16 @@ public class TransferApplyServiceImpl implements TransferApplyService { public List getProSelect(TransferApplyDto dto) { return transferApplyMapper.getProSelect(dto); } + + @Override + public List getTransferApplyFiles(TransferApplyDto dto) { + List contents = transferApplyMapper.getTransferApplyFilesContents(dto); + List list = new ArrayList<>(); + for (String content : contents) { + dto.setParentId(content); + List dtos = transferApplyMapper.getTransferApplyFiles(content); + list.addAll(dtos); + } + return list; + } } diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 71c1ff2..83180f4 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -281,31 +281,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +