其他功能合并

zhuo

2025-05-20 112d964cbc94154dd4ca75851231d0c477ebc571

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;

import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,17 +11,20 @@
import com.deepoove.poi.config.ConfigureBuilder;


import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.*;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordIssueRecycleMapper;

import com.ruoyi.manage.pojo.ManageRecordIssueRecycle;

import com.ruoyi.manage.service.ManageRecordIssueRecycleService;

import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.util.ZipSecureFile;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
@@ -42,7 +46,7 @@
 * 所有文件(内、外部文件)的发放与回收记录 服务实现类
 * </p>
 *
 * @author 芯导软件（江苏）有限公司
 * @author
 * @since 2024-11-13 09:11:05
 */
@Service
@@ -59,11 +63,8 @@
    private UserMapper userMapper;

    @Override
    public Map<String, Object> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(ManageRecordIssueRecycle.class));
        map.put("body", manageRecordIssueRecycleMapper.pageManageRecordIssueRecycle(page, QueryWrappers.queryWrappers(manageRecordIssueRecycle)));
        return map;
    public IPage<ManageRecordIssueRecycle> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle) {
        return manageRecordIssueRecycleMapper.pageManageRecordIssueRecycle(page, QueryWrappers.queryWrappers(manageRecordIssueRecycle));
    }

    @Override
@@ -77,6 +78,8 @@
            OutputStream outputStream = new FileOutputStream(file);
            IOUtils.copy(inputStream, outputStream);
            url = file.getAbsolutePath();
            inputStream.close();
            outputStream.close();
        } catch (FileNotFoundException e) {
            throw new ErrorException("找不到模板文件");
        } catch (IOException e) {
@@ -612,7 +615,6 @@
                for (int i = 2; i < rows.size(); i++) { // 从第三行开始，跳过表头
                    XWPFTableRow row = rows.get(i);
                    if (row.getTableCells().size() != 12) {
                        System.out.println("行 " + (i + 1) + " 的列数不匹配，跳过该行");
                        continue;
                    }
                    if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {