From 836b0d97da115adceabe22a2cf6d82137cc0b417 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 11 Dec 2025 10:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchivingManageController.java | 38 ++++++++++++++++++- .../system/mapper/FileManageMapper.java | 2 + .../system/mapper/FileManageMapper.xml | 8 ++++ .../system/mapper/TransferApplyMapper.xml | 1 + .../service/impl/ProjectServiceImpl.java | 19 +++++++--- 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ArchivingManageController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ArchivingManageController.java index 12c407a..9d8c643 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ArchivingManageController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ArchivingManageController.java @@ -2,14 +2,20 @@ package org.springblade.system.controller; import com.github.pagehelper.PageHelper; import io.swagger.v3.oas.annotations.Operation; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springblade.common.annotation.RequiresPermissions; +import org.springblade.common.annotation.SysLog; import org.springblade.common.core.controller.BaseController; import org.springblade.common.core.domain.AjaxResult; import org.springblade.common.core.page.TableDataInfo; +import org.springblade.common.enums.OperaType; import org.springblade.common.utils.sql.SqlUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.domain.*; +import org.springblade.system.mapper.FileManageMapper; +import org.springblade.system.service.FileManageService; import org.springblade.system.service.ProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +39,11 @@ public class ArchivingManageController extends BaseController { @Autowired private ProjectService service; + @Resource + private FileManageMapper fileManageMapper; + @Autowired + private FileManageService fileManageService; + @PostMapping("list") public TableDataInfo getProjectList(@RequestBody ProjectDto dto) { try { @@ -46,7 +57,7 @@ public class ArchivingManageController extends BaseController { projectDto.setDeptId(getDeptId()); projectDto.setAuditStatus(service.getAuditStatus(projectDto)); } - if (StringUtils.isNotBlank(dto.getAuditStatus())){ + if (StringUtils.isNotBlank(dto.getAuditStatus())) { list = list.stream().filter(projectDto -> projectDto.getAuditStatus().equals(dto.getAuditStatus())).toList(); } return getDataTable(list); @@ -56,6 +67,29 @@ public class ArchivingManageController extends BaseController { } } + @PostMapping("getFileManageByDept") + @SysLog(title = "第四级档案信息", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "第四级档案信息", logType = 1) + @RequiresPermissions("file:manage:query") + public TableDataInfo getFileManageByDept(@RequestBody DaKyProFilesContentsDto dto) { + if (dto.getParentId().equals("0")) { + return getDataTable(new ArrayList<>()); + } else { + Integer level = fileManageMapper.getLevelById(dto); + if (level == 4) { + // 直接使用 dto 中的分页参数 + PageHelper.startPage(dto.getPageNum() != null ? dto.getPageNum() : 1, + dto.getPageSize() != null ? dto.getPageSize() : 10, + SqlUtil.escapeOrderBySql(dto.getOrderBy())) + .setReasonable(dto.getReasonable() != null ? dto.getReasonable() : true); + dto.setUnitName(getDeptId()); + List list = fileManageService.FileManage(dto); + return getDataTable(list); + } else { + return getDataTable(new ArrayList<>()); + } + } + } + @PostMapping("getArchivingManageFiles") @Operation(summary = "归档审核获取整改文件") public AjaxResult getArchivingManageFiles(@RequestBody TransferApplyDto dto) { @@ -78,6 +112,7 @@ public class ArchivingManageController extends BaseController { return AjaxResult.error("请求出错了"); } } + @PostMapping("agreeRectification") @Operation(summary = "同意归档") public AjaxResult agreeRectification(@RequestBody RectificationDto dto) { @@ -88,6 +123,7 @@ public class ArchivingManageController extends BaseController { return AjaxResult.error("请求出错了"); } } + @PostMapping("transferAuditDetail") @Operation(summary = "责任单位审核情况") public AjaxResult transferAuditDetail(@RequestBody RectificationDto dto) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java index 1fcf989..55ab9d9 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java @@ -74,4 +74,6 @@ public interface FileManageMapper { Integer updateTransferAudit(RectificationDto dto); List transferAuditDetail(RectificationDto dto); + + Integer selectAuditStatus(RectificationDto dto); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml index 6f31a41..5116847 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml @@ -277,6 +277,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE(dkfs.create_time) = #{uploadTime} + + and dkpfc.unit_name = #{unitName} + order by dkpfc.create_time desc + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml index cbd4095..3dc7583 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml @@ -770,6 +770,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dkpfc.parent_id = #{parentId} AND dkpfc.pro_id = #{proId} AND dkpfc1.pro_id = #{proId} AND dkpfc2.pro_id = #{proId} AND dkpfc3.pro_id = #{proId} AND dkpfc.LEVEL = 5 + AND dkpfc.unit_name = #{deptId} AND NOT EXISTS ( SELECT 1 FROM record_rectification_list tf WHERE tf.file_id = dkfs.id and tf.rectification_type = '1') diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ProjectServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ProjectServiceImpl.java index 53e2c7f..cba8e58 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ProjectServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ProjectServiceImpl.java @@ -102,6 +102,7 @@ public class ProjectServiceImpl implements ProjectService { List list = new ArrayList<>(); for (String content : contents) { dto.setParentId(content); + dto.setDeptId(AuthUtil.getDeptId()); List dtos = transferApplyMapper.ArchivingManageFile(dto); list.addAll(dtos); } @@ -147,15 +148,21 @@ public class ProjectServiceImpl implements ProjectService { try { dto.setAuditDept(AuthUtil.getUser().getDeptId().toString()); dto.setAuditStatus("1"); + // 更新审核状态 fileManageMapper.updateTransferAudit(dto); - Integer i = fileManageMapper.agreeRectification(dto); - if (i > 0) { - return AjaxResult.success("归档成功"); - } else { - return AjaxResult.error("归档失败"); + // 检查是否所有部门都审核通过（0表示全部通过） + Integer auditStatus = fileManageMapper.selectAuditStatus(dto); + if (auditStatus != null && auditStatus == 0) { + Integer i = fileManageMapper.agreeRectification(dto); + if (i != null && i > 0) { + return AjaxResult.success("归档成功"); + } else { + return AjaxResult.error("归档失败"); + } } + return AjaxResult.success(); } catch (Exception e) { - return AjaxResult.error("接口异常"); + return AjaxResult.error("接口异常: " + e.getMessage()); } }