From a465f67fdd32f818f35938eded708b166b1cc1f7 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 20 二月 2025 10:25:37 +0800 Subject: [PATCH] 搬迁cnas的8体系管理要求模块完成 --- cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java index 151ee3b..52cf02d 100644 --- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java +++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java @@ -10,7 +10,11 @@ import com.deepoove.poi.config.ConfigureBuilder; - +import com.deepoove.poi.data.*; +import com.deepoove.poi.data.style.*; +import com.ruoyi.common.utils.QueryWrappers; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.framework.exception.ErrorException; import com.ruoyi.manage.mapper.ManageRecordAuditMapper; import com.ruoyi.manage.pojo.ManageRecordAudit; @@ -19,9 +23,6 @@ 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; @@ -61,16 +62,14 @@ @Override - public Map<String, Object> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit) { - Map<String, Object> map = new HashMap<>(); - map.put("head", PrintChina.printChina(ManageRecordAudit.class)); + public IPage<ManageRecordAudit> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit) { + IPage<ManageRecordAudit> manageRecordAuditIPage = manageRecordAuditMapper.pageManageRecordAudit(page, QueryWrappers.queryWrappers(manageRecordAudit)); for (ManageRecordAudit record : manageRecordAuditIPage.getRecords()) { String limsName = userMapper.selectUserDepartmentLimsName(record.getCreateUser()); record.setCreateUserDepart(limsName); } - map.put("body", manageRecordAuditIPage); - return map; + return manageRecordAuditIPage; } @Override -- Gitblit v1.9.3