From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
index f439b59..3c1afed 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.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.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordCheckMapper;
import com.ruoyi.manage.pojo.ManageRecordCheck;
import com.ruoyi.manage.service.ManageRecordCheckService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
-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.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -44,7 +48,7 @@
* 鏂囦欢瀹℃壒璁板綍(鍚慨璁㈠悗鍐嶆瀹℃壒璁板綍) 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-12 02:31:36
*/
@Service
@@ -60,14 +64,11 @@
@Resource
private UserMapper userMapper;
-
+
@Override
- public Map<String, Object> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordCheck.class));
- map.put("body", manageRecordCheckMapper.pageManageRecordCheck(page, QueryWrappers.queryWrappers(manageRecordCheck)));
- return map;
+ public IPage<ManageRecordCheck> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck) {
+ return manageRecordCheckMapper.pageManageRecordCheck(page, QueryWrappers.queryWrappers(manageRecordCheck));
}
@Override
@@ -99,6 +100,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) {
@@ -420,7 +423,6 @@
for (int i = 1; i < rows.size(); i++) { // 浠庣浜岃寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 9) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
--
Gitblit v1.9.3